| commit | 32f9c9af1335b121f4e1857ff61e85cffb27a1a6 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Jun 25 16:37:24 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Jun 25 16:37:24 2013 -0700 |
| tree | b6b12c6e8d5559a335a815a595e3c7ef1f05cf0e | |
| parent | b23e58abd4c8f5db6bffb3c38eba44372fd530af [diff] | |
| parent | 470a10535931be565baa1b1b805756f5cf01e2ad [diff] |
Merge "camera_v2: Don't touch CCI if daemon crashed."
diff --git a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c index a6c5639..a27ca99 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c +++ b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
@@ -795,10 +795,7 @@ rc = msm_cci_config(sd, arg); break; case MSM_SD_SHUTDOWN: { - struct msm_camera_cci_ctrl ctrl_cmd; - ctrl_cmd.cmd = MSM_CCI_RELEASE; - rc = msm_cci_config(sd, &ctrl_cmd); - break; + return rc; } default: rc = -ENOIOCTLCMD;
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c index 34f4428..7f474bb 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c +++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
@@ -1175,9 +1175,10 @@ case VIDIOC_MSM_SENSOR_CFG: return s_ctrl->func_tbl->sensor_config(s_ctrl, argp); case VIDIOC_MSM_SENSOR_RELEASE: - case MSM_SD_SHUTDOWN: msm_sensor_stop_stream(s_ctrl); return 0; + case MSM_SD_SHUTDOWN: + return 0; default: return -ENOIOCTLCMD; }