From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 15 Mar 2013 14:16:56 +0000 (-0300)
Subject: [media] solo6x10: also stop DMA if the SOLO_PCI_ERR_P2M_DESC is raised
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=4718892f0f8998685ed7980cb723a165030ae50d;p=linux-edison.git

[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>
---

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++) {