Merge "msm: camera: flash: Maintain flash state in flash off" into camera-kernel.lnx.3.1

drivers/cam_sensor_module/cam_flash/cam_flash_core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -526,6 +526,7 @@ int cam_flash_off(struct cam_flash_ctrl *flash_ctrl)
		CAM_ERR(CAM_SENSOR,
		"cannot apply streamoff settings");
		}
		flash_ctrl->flash_state = CAM_FLASH_STATE_CONFIG;
		}

		return 0;