Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877557aa authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera2: cpp: Setup timer once during probe"

parents 776533e4 9762c95b

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

+4 −4
Original line number Diff line number Diff line
@@ -1672,10 +1672,6 @@ static int msm_cpp_send_frame_to_hardware(struct cpp_device *cpp_dev, 
			flags);

		if (queue_len == 1) {

			atomic_set(&cpp_timer.used, 1);

			/* install timer for cpp timeout */

			CPP_DBG("Installing cpp_timer\n");

			setup_timer(&cpp_timer.cpp_timer,

				cpp_timer_callback, (unsigned long)&cpp_timer);

		}

		CPP_DBG("Starting timer to fire in %d ms. (jiffies=%lu)\n",

			CPP_CMD_TIMEOUT_MS, jiffies);
@@ -3524,6 +3520,10 @@ static int cpp_probe(struct platform_device *pdev) 
	cpp_dev->iommu_state = CPP_IOMMU_STATE_DETACHED;

	cpp_timer.data.cpp_dev = cpp_dev;

	atomic_set(&cpp_timer.used, 0);

	/* install timer for cpp timeout */

	CPP_DBG("Installing cpp_timer\n");

	setup_timer(&cpp_timer.cpp_timer,

		cpp_timer_callback, (unsigned long)&cpp_timer);

	cpp_dev->fw_name_bin = NULL;

	if (rc == 0)

		CPP_DBG("SUCCESS.");