Merge "camera: Correct call to wait_event_interruptible_timeout." into msm-3.0