Merge "msm: camera2: cpp: Remove the reinstallation of cpp_timer" (f35db9d8) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1202,9 +1202,6 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
		}

		this_frame = cpp_timer.data.processed_frame;
		pr_err("ReInstalling cpp_timer\n");
		setup_timer(&cpp_timer.cpp_timer, cpp_timer_callback,
		(unsigned long)&cpp_timer);
		pr_err("Starting timer to fire in %d ms. (jiffies=%lu)\n",
		CPP_CMD_TIMEOUT_MS, jiffies);
		ret = mod_timer(&cpp_timer.cpp_timer,