Merge "UPSTREAM: Merge PC182 - commit...

Merge "UPSTREAM: Merge PC182 - commit '23636c33' into mainline - 06/13"

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -599,7 +599,8 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
		} else {
		CAM_ERR(CAM_SENSOR, "Invalid Command Type: %d",
		cmd->handle_type);
		return -EINVAL;
		rc = -EINVAL;
		goto release_mutex;
		}

		pu = power_info->power_setting;