OSDN Git Service

s5p-mfc: Fix unbalanced call to clock management
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 22 Mar 2017 07:53:57 +0000 (04:53 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 May 2017 12:30:14 +0000 (14:30 +0200)
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>
drivers/media/platform/s5p-mfc/s5p_mfc.c

index c8946f9..7727789 100644 (file)
@@ -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");
        }