diff options
| author | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
| commit | 12456e509be25d24fe479394852428517922d02a (patch) | |
| tree | 8b1e8e1025ce1beb350bbf977ac8b8ffdd5fbfa1 /drivers/scsi/scsi_lib.c | |
| parent | Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Linux 5.1-rc7 (diff) | |
| download | kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.gz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.xz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.zip | |
Merge 5.1-rc7 into usb-next
We need this to make the usb-gadget branch merge cleaner. And for
testing to keep from hitting the same issues already fixed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 601b9f1de267..07dfc17d4824 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1706,8 +1706,12 @@ out_put_budget: ret = BLK_STS_DEV_RESOURCE; break; default: + if (unlikely(!scsi_device_online(sdev))) + scsi_req(req)->result = DID_NO_CONNECT << 16; + else + scsi_req(req)->result = DID_ERROR << 16; /* - * Make sure to release all allocated ressources when + * Make sure to release all allocated resources when * we hit an error, as we will never see this command * again. */ |