Merge "msm: camera: Synchronize v4l2 subscribe and unsubscribe event in camera.c" (0cdce1ee) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/camera/camera.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -459,7 +459,9 @@ static int camera_v4l2_subscribe_event(struct v4l2_fh *fh,
		int rc = 0;
		struct camera_v4l2_private *sp = fh_to_private(fh);

		mutex_lock(&sp->lock);
		rc = v4l2_event_subscribe(&sp->fh, sub, 5, NULL);
		mutex_unlock(&sp->lock);

		return rc;
		}
		@@ -470,7 +472,9 @@ static int camera_v4l2_unsubscribe_event(struct v4l2_fh *fh,
		int rc = 0;
		struct camera_v4l2_private *sp = fh_to_private(fh);

		mutex_lock(&sp->lock);
		rc = v4l2_event_unsubscribe(&sp->fh, sub);
		mutex_unlock(&sp->lock);

		return rc;
		}