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

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -458,7 +458,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;
		}
		@@ -469,7 +471,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;
		}