diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-15 05:43:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-15 05:43:21 -0700 |
| commit | 0fcfb086fe3b561c93f5832f0d30e5a620ecef19 (patch) | |
| tree | 4304bcb84864ff51b78537aff95b38f007a239c7 /drivers/scsi | |
| parent | 65b05aeab8e66e4a27a48d5b75544164ab879834 (diff) | |
| parent | 22397c476f62f5e078d49bb00f12895d11c0afa2 (diff) | |
Merge "Merge android-4.4.120 (d63fdf6) into msm-4.4"
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/storvsc_drv.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 8fae03215a85..543c10266984 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -366,7 +366,7 @@ enum ibmvfc_fcp_rsp_info_codes { }; struct ibmvfc_fcp_rsp_info { - __be16 reserved; + u8 reserved[3]; u8 rsp_code; u8 reserved2[4]; }__attribute__((packed, aligned (2))); diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 5e4e1ba96f10..351d81dc2200 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -890,10 +890,11 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb, case TEST_UNIT_READY: break; default: - set_host_byte(scmnd, DID_TARGET_FAILURE); + set_host_byte(scmnd, DID_ERROR); } break; case SRB_STATUS_INVALID_LUN: + set_host_byte(scmnd, DID_NO_CONNECT); do_work = true; process_err_fn = storvsc_remove_lun; break; |