diff --git a/[refs] b/[refs]
index e80b2555afa3..eb375f438878 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c2b39087c900bdb240b50ac95ee9da00d844565
+refs/heads/master: 2cf3af1c9ec26f8db3f386e48f9d979ad8bb3eff
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index cae6a1383282..cd830cb64a5d 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3333,8 +3333,9 @@ static inline int interrupt_pending(ctlr_info_t *h)
 
 static inline long interrupt_not_for_us(ctlr_info_t *h)
 {
-	return (((h->access.intr_pending(h) == 0) ||
-		(h->interrupts_enabled == 0)));
+	return !(h->msi_vector || h->msix_vector) &&
+		((h->access.intr_pending(h) == 0) ||
+		(h->interrupts_enabled == 0));
 }
 
 static inline int bad_tag(ctlr_info_t *h, u32 tag_index,