sugar/linux
1
0
Fork 0
Code Activity

Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes

Browse Source
This commit is contained in:
James Bottomley
2017-03-29 10:10:30 -04:00
parent ca4a213db0 a3902ee983
commit 0917ac4f53
12 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/qla2xxx/qla_os.c
View File

@@ -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() -