diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-15 10:16:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-25 07:48:28 -0400 |
commit | 4718892f0f8998685ed7980cb723a165030ae50d (patch) | |
tree | fd950d5155e945ee79af42580f3d32c0734fb855 | |
parent | 4c211ed7e56bac729eab6552a2b8e85756f1cffd (diff) |
[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>
-rw-r--r-- | drivers/staging/media/solo6x10/p2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/p2m.c b/drivers/staging/media/solo6x10/p2m.c index a77c8d9ed0bf..333594189b81 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) | |||
198 | struct solo_p2m_dev *p2m_dev; | 198 | struct solo_p2m_dev *p2m_dev; |
199 | int i; | 199 | int i; |
200 | 200 | ||
201 | if (!(err & SOLO_PCI_ERR_P2M)) | 201 | if (!(err & (SOLO_PCI_ERR_P2M | SOLO_PCI_ERR_P2M_DESC))) |
202 | return; | 202 | return; |
203 | 203 | ||
204 | for (i = 0; i < SOLO_NR_P2M; i++) { | 204 | for (i = 0; i < SOLO_NR_P2M; i++) { |