aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-15 11:16:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-25 08:48:28 -0300
commit4718892f0f8998685ed7980cb723a165030ae50d (patch)
treefd950d5155e945ee79af42580f3d32c0734fb855 /drivers/staging/media
parent4c211ed7e56bac729eab6552a2b8e85756f1cffd (diff)
downloadvexpress-lsk-4718892f0f8998685ed7980cb723a165030ae50d.tar.gz
[media] solo6x10: also stop DMA if the SOLO_PCI_ERR_P2M_DESC is raised
Otherwise the computer will hang. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/solo6x10/p2m.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/p2m.c b/drivers/staging/media/solo6x10/p2m.c
index a77c8d9ed0b..333594189b8 100644
--- a/drivers/staging/media/solo6x10/p2m.c
+++ b/drivers/staging/media/solo6x10/p2m.c
@@ -198,7 +198,7 @@ void solo_p2m_error_isr(struct solo_dev *solo_dev)
struct solo_p2m_dev *p2m_dev;
int i;
- if (!(err & SOLO_PCI_ERR_P2M))
+ if (!(err & (SOLO_PCI_ERR_P2M | SOLO_PCI_ERR_P2M_DESC)))
return;
for (i = 0; i < SOLO_NR_P2M; i++) {