summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorJames Bottomley2016-03-15 23:24:44 +0100
committerJames Bottomley2016-03-15 23:24:44 +0100
commita7dee8f45fa2948b74d8e84ba24e435c87fd0acf (patch)
tree06ec1c93334f581e341cf74f5639ce645266fc14 /drivers/scsi/scsi_lib.c
parentMAINTAINERS: use new email address for James Bottomley (diff)
parentsg: fix dxferp in from_to case (diff)
downloadkernel-qcow2-linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.gz
kernel-qcow2-linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.xz
kernel-qcow2-linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.zip
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d46193a5e246..8106515d1df8 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1344,6 +1344,7 @@ scsi_prep_return(struct request_queue *q, struct request *req, int ret)
switch (ret) {
case BLKPREP_KILL:
+ case BLKPREP_INVALID:
req->errors = DID_NO_CONNECT << 16;
/* release the command and kill it */
if (req->special) {