s5p-mfc: Fix unbalanced call to clock management

mszyprow · gregkh · commit a896652f6ad3 · 2017-05-25T14:30:14.000+02:00
commit a5cb00eb4223458250b55daf03ac7ea5f424d601 upstream. Clock should be turned off after calling s5p_mfc_init_hw() from the watchdog worker, like it is already done in the s5p_mfc_open() which also calls this function. Fixes: af93574 ("[media] MFC: Add MFC 5.1 V4L2 driver") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -173,6 +173,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
 		}
 		s5p_mfc_clock_on();
 		ret = s5p_mfc_init_hw(dev);
+		s5p_mfc_clock_off();
 		if (ret)
 			mfc_err("Failed to reinit FW\n");
 	}

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)`
`173`	`173`	`}`
`174`	`174`	`s5p_mfc_clock_on();`
`175`	`175`	`ret = s5p_mfc_init_hw(dev);`
	`176`	`+ s5p_mfc_clock_off();`
`176`	`177`	`if (ret)`
`177`	`178`	`mfc_err("Failed to reinit FW\n");`
`178`	`179`	`}`