summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2014-02-18 13:56:09 -0600
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 10:19:05 -0700
commit1f7cee8c7d44ad360a16c7e87831b4568419322b (patch)
tree12e9dce77f971cbe4ac17afcc76daff9a7d78f29 /drivers/scsi/hpsa.c
parentb66cc250ee700ba019ae6801726588b8bf6d9144 (diff)
downloadlinux-stable-1f7cee8c7d44ad360a16c7e87831b4568419322b.tar.gz
linux-stable-1f7cee8c7d44ad360a16c7e87831b4568419322b.tar.bz2
linux-stable-1f7cee8c7d44ad360a16c7e87831b4568419322b.zip
[SCSI] hpsa: Acknowledge controller events in ioaccell mode 2 as well as mode 1
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r--drivers/scsi/hpsa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index e55e787f5092..1c6bd79078e8 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5485,7 +5485,8 @@ static int hpsa_kickoff_rescan(struct ctlr_info *h)
char *event_type;
/* Ask the controller to clear the events we're handling. */
- if (h->transMethod & (CFGTBL_Trans_io_accel1) &&
+ if ((h->transMethod & (CFGTBL_Trans_io_accel1
+ | CFGTBL_Trans_io_accel2)) &&
(h->events & HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_STATE_CHANGE ||
h->events & HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_CONFIG_CHANGE)) {