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

Merge "msm: camera: Add lock/unlock to "set mode" function"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-13 08:07:55 -08:00 • committed by Gerrit - the friendly Code Review server
commit 22df240473
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -295,6 +295,7 @@ int32_t msm_camera_tz_ta_set_mode(uint32_t mode,
cmd_len = sizeof(struct msm_camera_tz_set_mode_req_t); cmd_len = sizeof(struct msm_camera_tz_set_mode_req_t);
rsp_len = sizeof(struct msm_camera_tz_set_mode_rsp_t); rsp_len = sizeof(struct msm_camera_tz_set_mode_rsp_t);
msm_camera_tz_lock();
rc = get_cmd_rsp_buffers(ta_qseecom_handle, rc = get_cmd_rsp_buffers(ta_qseecom_handle,
(void **)&cmd, &cmd_len, (void **)&rsp, &rsp_len); (void **)&cmd, &cmd_len, (void **)&rsp, &rsp_len);
if (!rc) { if (!rc) {
@ -309,10 +310,12 @@ int32_t msm_camera_tz_ta_set_mode(uint32_t mode,
pr_err("%s:%d - Failed: rc=%d\n", pr_err("%s:%d - Failed: rc=%d\n",
__func__, __LINE__, __func__, __LINE__,
rc); rc);
msm_camera_tz_unlock();
return rc; return rc;
} }
rc = rsp->rc; rc = rsp->rc;
} }
msm_camera_tz_unlock();
CDBG("Done: rc=%d, Mode=0x%08X - %lluus\n", CDBG("Done: rc=%d, Mode=0x%08X - %lluus\n",
rc, mode, rc, mode,
ktime_us_delta(ktime_get(), startTime)); ktime_us_delta(ktime_get(), startTime));