diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-22 04:11:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-22 04:11:35 -0700 |
| commit | af6102c60e82c921e5d228b8e6d956c38e1fd84a (patch) | |
| tree | 4b6326bbd49a6d52d5f3676c5f5c0a973648e5fe | |
| parent | a39227b9229391cedcedc944b6f8dc64f52bebc3 (diff) | |
| parent | d16420b459bada79a7bb28a63ef0b8f8f7cbc5b0 (diff) | |
Merge "msm: sensor: Add mutex lock during ois power down operations"
| -rw-r--r-- | drivers/media/platform/msm/ais/sensor/ois/msm_ois.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/ais/sensor/ois/msm_ois.c b/drivers/media/platform/msm/ais/sensor/ois/msm_ois.c index aa7658f359ac..4a74e808d86f 100644 --- a/drivers/media/platform/msm/ais/sensor/ois/msm_ois.c +++ b/drivers/media/platform/msm/ais/sensor/ois/msm_ois.c @@ -623,11 +623,13 @@ static long msm_ois_subdev_ioctl(struct v4l2_subdev *sd, pr_err("o_ctrl->i2c_client.i2c_func_tbl NULL\n"); return -EINVAL; } + mutex_lock(o_ctrl->ois_mutex); rc = msm_ois_power_down(o_ctrl); if (rc < 0) { pr_err("%s:%d OIS Power down failed\n", __func__, __LINE__); } + mutex_unlock(o_ctrl->ois_mutex); return msm_ois_close(sd, NULL); default: return -ENOIOCTLCMD; |