evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ais: Synchronize camera open/close calls"

Browse source
This commit is contained in:
Linux Build Service Account 2017-09-14 17:08:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4f41b2e62b
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/msm/ais/camera/camera.c
View file

@ -628,6 +628,7 @@ static int camera_v4l2_open(struct file *filep)
if (WARN_ON(!pvdev)) if (WARN_ON(!pvdev))
return -EIO; return -EIO;
mutex_lock(&pvdev->video_drvdata_mutex);
rc = camera_v4l2_fh_open(filep); rc = camera_v4l2_fh_open(filep);
if (rc < 0) { if (rc < 0) {
pr_err("%s : camera_v4l2_fh_open failed Line %d rc %d\n", pr_err("%s : camera_v4l2_fh_open failed Line %d rc %d\n",
@ -698,6 +699,7 @@ static int camera_v4l2_open(struct file *filep)
idx |= (1 << find_first_zero_bit((const unsigned long *)&opn_idx, idx |= (1 << find_first_zero_bit((const unsigned long *)&opn_idx,
MSM_CAMERA_STREAM_CNT_BITS)); MSM_CAMERA_STREAM_CNT_BITS));
atomic_cmpxchg(&pvdev->opened, opn_idx, idx); atomic_cmpxchg(&pvdev->opened, opn_idx, idx);
mutex_unlock(&pvdev->video_drvdata_mutex);
return rc; return rc;
@ -712,6 +714,7 @@ stream_fail:
vb2_q_fail: vb2_q_fail:
camera_v4l2_fh_release(filep); camera_v4l2_fh_release(filep);
fh_open_fail: fh_open_fail:
mutex_unlock(&pvdev->video_drvdata_mutex);
return rc; return rc;
} }
@ -746,6 +749,7 @@ static int camera_v4l2_close(struct file *filep)
if (WARN_ON(!session)) if (WARN_ON(!session))
return -EIO; return -EIO;
mutex_lock(&pvdev->video_drvdata_mutex);
mutex_lock(&session->close_lock); mutex_lock(&session->close_lock);
opn_idx = atomic_read(&pvdev->opened); opn_idx = atomic_read(&pvdev->opened);
mask = (1 << sp->stream_id); mask = (1 << sp->stream_id);
@ -788,6 +792,7 @@ static int camera_v4l2_close(struct file *filep)
} }
camera_v4l2_fh_release(filep); camera_v4l2_fh_release(filep);
mutex_unlock(&pvdev->video_drvdata_mutex);
return 0; return 0;
} }
@ -936,6 +941,7 @@ int camera_init_v4l2(struct device *dev, unsigned int *session)
*session = pvdev->vdev->num; *session = pvdev->vdev->num;
atomic_set(&pvdev->opened, 0); atomic_set(&pvdev->opened, 0);
mutex_init(&pvdev->video_drvdata_mutex);
video_set_drvdata(pvdev->vdev, pvdev); video_set_drvdata(pvdev->vdev, pvdev);
device_init_wakeup(&pvdev->vdev->dev, 1); device_init_wakeup(&pvdev->vdev->dev, 1);
goto init_end; goto init_end;

1
drivers/media/platform/msm/ais/msm.h
View file

@ -46,6 +46,7 @@ extern bool is_daemon_status;
struct msm_video_device { struct msm_video_device {
struct video_device *vdev; struct video_device *vdev;
atomic_t opened; atomic_t opened;
struct mutex video_drvdata_mutex;
}; };
struct msm_queue_head { struct msm_queue_head {