summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/storvsc_drv.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-03-15 15:24:44 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-03-15 15:24:44 -0700
commita7dee8f45fa2948b74d8e84ba24e435c87fd0acf (patch)
tree06ec1c93334f581e341cf74f5639ce645266fc14 /drivers/scsi/storvsc_drv.c
parent7ee7895c93d1d6cafad2f5d187f0a9369e91eaec (diff)
parent5ecee0a3ee8d74b6950cb41e8989b0c2174568d4 (diff)
downloadtalos-op-linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.gz
talos-op-linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.zip
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/scsi/storvsc_drv.c')
-rw-r--r--drivers/scsi/storvsc_drv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 292c04eec9ad..3ddcabb790a8 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -914,8 +914,9 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
do_work = true;
process_err_fn = storvsc_remove_lun;
break;
- case (SRB_STATUS_ABORTED | SRB_STATUS_AUTOSENSE_VALID):
- if ((asc == 0x2a) && (ascq == 0x9)) {
+ case SRB_STATUS_ABORTED:
+ if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID &&
+ (asc == 0x2a) && (ascq == 0x9)) {
do_work = true;
process_err_fn = storvsc_device_scan;
/*
OpenPOWER on IntegriCloud