diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-03-29 10:10:30 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2017-03-29 10:10:30 -0400 |
| commit | 0917ac4f5346d01cee1d568ff5dc0b99be02829e (patch) | |
| tree | 6195542ea982d0ee813d4f7d0d33bad40dc4a1cc /drivers/scsi/qla2xxx | |
| parent | ca4a213db0b66513ba384d5f397fa60f1d0550d0 (diff) | |
| parent | a3902ee98304324f681088203391b5c0353ce977 (diff) | |
Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 1fed235a1b4a..f28d38e93439 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1651,7 +1651,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res) /* Don't abort commands in adapter during EEH * recovery as it's not accessible/responding. */ - if (GET_CMD_SP(sp) && !ha->flags.eeh_busy) { + if (GET_CMD_SP(sp) && !ha->flags.eeh_busy && + (sp->type == SRB_SCSI_CMD)) { /* Get a reference to the sp and drop the lock. * The reference ensures this sp->done() call * - and not the call in qla2xxx_eh_abort() - |