diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-02-09 17:07:17 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-09 17:07:17 -0800 |
| commit | f2604c4f48510b86c3d89ce9dc2d867cdfed07a7 (patch) | |
| tree | e8bcf3d11fc525332dddf3b482658c980b03b908 | |
| parent | 5ea3f07aeca8241f5ec52055d82014d4a2e4e81d (diff) | |
| parent | 433a3513cb7b7890aad411019fdb553c3daf63a1 (diff) | |
Merge "msm: ais: Synchronize v4l2 subscribe and unsubscribe event"
| -rw-r--r-- | drivers/media/platform/msm/ais/camera/camera.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/ais/camera/camera.c b/drivers/media/platform/msm/ais/camera/camera.c index 3f477d50ceaf..afba7386a82b 100644 --- a/drivers/media/platform/msm/ais/camera/camera.c +++ b/drivers/media/platform/msm/ais/camera/camera.c @@ -1,4 +1,4 @@ -/* 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 @@ -464,7 +464,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; } @@ -475,7 +477,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; } |