diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2017-03-22 03:53:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-25 09:44:41 -0400 |
| commit | 074912daab5584e79e3e8d8291f4cc33b14ac9d3 (patch) | |
| tree | f3f35bbd4523086cd3f6103fe3c9e8d2916a3035 | |
| parent | 4a9c54250492a1a8c5fa62885c7f3dcd3eefb76b (diff) | |
s5p-mfc: Fix unbalanced call to clock management
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: af93574678108 ("[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>
| -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 d566b918c600..7c24da51626c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c | |||
| @@ -206,6 +206,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) | |||
| 206 | } | 206 | } |
| 207 | s5p_mfc_clock_on(); | 207 | s5p_mfc_clock_on(); |
| 208 | ret = s5p_mfc_init_hw(dev); | 208 | ret = s5p_mfc_init_hw(dev); |
| 209 | s5p_mfc_clock_off(); | ||
| 209 | if (ret) | 210 | if (ret) |
| 210 | mfc_err("Failed to reinit FW\n"); | 211 | mfc_err("Failed to reinit FW\n"); |
| 211 | } | 212 | } |