diff options
| author | Arun Mankuzhi <arun.m@samsung.com> | 2014-10-21 08:07:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 15:50:34 -0200 |
| commit | b16e64482dd2346f7fc68ec4150bb1ddf1f988e6 (patch) | |
| tree | 708de88eb0c4075c157a12c900e606fce61a480d /drivers/media/platform/s5p-mfc | |
| parent | 773e635266b10244c63259f3366b5b4bc7c215c1 (diff) | |
| download | op-kernel-dev-b16e64482dd2346f7fc68ec4150bb1ddf1f988e6.zip op-kernel-dev-b16e64482dd2346f7fc68ec4150bb1ddf1f988e6.tar.gz | |
[media] s5p-mfc: De-init MFC when watchdog kicks in
If the software watchdog kicks in, we need to de-init MFC
before reloading firmware and re-intializing it again.
Signed-off-by: Arun Mankuzhi <arun.m@samsung.com>
Signed-off-by: Kiran AVND <avnd.kiran@samsung.com>
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 8620236..39f8f2a 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -159,6 +159,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) } clear_bit(0, &dev->hw_lock); spin_unlock_irqrestore(&dev->irqlock, flags); + + /* De-init MFC */ + s5p_mfc_deinit_hw(dev); + /* Double check if there is at least one instance running. * If no instance is in memory than no firmware should be present */ if (dev->num_inst > 0) { |
