Merge "msm: ais: Synchronize v4l2 subscribe and unsubscribe event" (b67a90fb) · Commits · e / devices / android_kernel_xiaomi_markw

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

+5 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -462,7 +462,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;
		}
		@@ -473,7 +475,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;
		}