diff --git a/[refs] b/[refs]
index 8e7877c1bfdc..47bf8bb58eb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c211ed7e56bac729eab6552a2b8e85756f1cffd
+refs/heads/master: 4718892f0f8998685ed7980cb723a165030ae50d
diff --git a/trunk/drivers/staging/media/solo6x10/p2m.c b/trunk/drivers/staging/media/solo6x10/p2m.c
index a77c8d9ed0bf..333594189b81 100644
--- a/trunk/drivers/staging/media/solo6x10/p2m.c
+++ b/trunk/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++) {