Skip to content

Commit

Permalink
cciss: check for msi in interrupt_not_for_us
Browse files Browse the repository at this point in the history
Check 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.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Mike Miller authored and Jens Axboe committed Aug 7, 2010
1 parent 0c2b390 commit 2cf3af1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 2cf3af1

Please sign in to comment.