aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index cae6a1383282..cd830cb64a5d 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3333,8 +3333,9 @@ static inline int interrupt_pending(ctlr_info_t *h)
3333 3333
3334static inline long interrupt_not_for_us(ctlr_info_t *h) 3334static inline long interrupt_not_for_us(ctlr_info_t *h)
3335{ 3335{
3336 return (((h->access.intr_pending(h) == 0) || 3336 return !(h->msi_vector || h->msix_vector) &&
3337 (h->interrupts_enabled == 0))); 3337 ((h->access.intr_pending(h) == 0) ||
3338 (h->interrupts_enabled == 0));
3338} 3339}
3339 3340
3340static inline int bad_tag(ctlr_info_t *h, u32 tag_index, 3341static inline int bad_tag(ctlr_info_t *h, u32 tag_index,