Merge "msm: camera: Update the CCI timeout."

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		#define CYCLES_PER_MICRO_SEC_DEFAULT 4915
		#define CCI_MAX_DELAY 1000000

		#define CCI_TIMEOUT msecs_to_jiffies(100)
		#define CCI_TIMEOUT msecs_to_jiffies(500)

		/* TODO move this somewhere else */
		#define MSM_CCI_DRV_NAME "msm_cci"