projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
773e635
)
[media] s5p-mfc: De-init MFC when watchdog kicks in
author
Arun Mankuzhi
<
[email protected]
>
Tue, 21 Oct 2014 11:07:03 +0000
(08:07 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Tue, 28 Oct 2014 17:50:34 +0000
(15:50 -0200)
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 <
[email protected]
>
Signed-off-by: Kiran AVND <
[email protected]
>
Signed-off-by: Arun Kumar K <
[email protected]
>
Signed-off-by: Kamil Debski <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/platform/s5p-mfc/s5p_mfc.c
patch
|
blob
|
history
diff --git
a/drivers/media/platform/s5p-mfc/s5p_mfc.c
b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 8620236200b72c27487793a34e785150cc5fc312..39f8f2af39dafcd94b2131f96a912cddb8a61974 100644
(file)
--- 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) {