[PATCH 3/6] cciss: check for msi in interrupt_not_for_us

[Mike Miller <mike.miller@hp.com>]

Patch 3 of 4
cciss: check for msi in interrupt_no_for_us
This patch checks to see if h->msi[x]_vector is set. We need this for a
following patch. Without this check we process one interrupt then stop
because in msi[x] mode the interrupt pending bit is not set. Not sure why we
didn't encounter this before.

From: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>

Signed-off-by: Mike Miller <mike.miller@hp.com>
---
 drivers/block/cciss.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index cae6a13..cd830cb 100644
--- a/drivers/block/cciss.c
+++ b/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,