diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2017-03-22 04:53:57 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-05 16:35:56 -0300 |
| commit | a5cb00eb4223458250b55daf03ac7ea5f424d601 (patch) | |
| tree | 150703f417a9db7cd8f2f26d8a4ed770a7bd1052 /drivers/media/platform/s5p-mfc/s5p_mfc.c | |
| parent | [media] s5p-mfc: Rename BANK1/2 to BANK_L/R to better match documentation (diff) | |
| download | linux-dev-a5cb00eb4223458250b55daf03ac7ea5f424d601.tar.xz linux-dev-a5cb00eb4223458250b55daf03ac7ea5f424d601.zip | |
[media] s5p-mfc: Fix unbalanced call to clock management
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: af93574678108 ("[media] MFC: Add MFC 5.1 V4L2 driver")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: stable@vger.kernel.org # v3.7+
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc.c')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 5f8cee185f6f..1afde5021ca6 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -211,6 +211,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"); } |