From f2f04652689377bb1ec15d19130421b0f34b6b1b Mon Sep 17 00:00:00 2001 From: Allon Huang Date: Mon, 26 Oct 2020 11:57:31 +0800 Subject: [PATCH] media: rockchip: cif: init reset timer triggered source once Signed-off-by: Allon Huang Change-Id: I33c49b34063ce150791864dc051c6e91f7016dc9 --- drivers/media/platform/rockchip/cif/dev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c index 9f51aa87e1e8..fa97bfa53b34 100644 --- a/drivers/media/platform/rockchip/cif/dev.c +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -957,16 +957,14 @@ static int rkcif_plat_probe(struct platform_device *pdev) if (rkcif_proc_init(cif_dev)) dev_warn(dev, "dev:%s create proc failed\n", dev_name(dev)); + cif_dev->reset_notifier.priority = 1; + cif_dev->reset_notifier.notifier_call = rkcif_reset_notifier; + rkcif_csi2_register_notifier(&cif_dev->reset_notifier); #if defined(CONFIG_ROCKCHIP_CIF_RESET_MONITOR_CONTINU) cif_dev->reset_watchdog_timer.reset_src = RKCIF_RESET_SRC_NORMAL; #else cif_dev->reset_watchdog_timer.reset_src = RKCIF_RESET_SRC_NON; #endif - - cif_dev->reset_notifier.priority = 1; - cif_dev->reset_notifier.notifier_call = rkcif_reset_notifier; - rkcif_csi2_register_notifier(&cif_dev->reset_notifier); - cif_dev->reset_watchdog_timer.reset_src = RKCIF_RESET_SRC_NORMAL; timer_setup(&cif_dev->reset_watchdog_timer.timer, rkcif_reset_watchdog_timer_handler, 0);