Merge "msm: vidc: Increase timeout for power collapse"

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@

		struct msm_vidc_drv *vidc_driver;

		uint32_t msm_vidc_pwr_collapse_delay = 2000;
		uint32_t msm_vidc_pwr_collapse_delay = 10000;

		static inline struct msm_vidc_inst get_vidc_inst(struct file filp, void *fh)
		{