commit 900469d0b0c337db19908f77d172f4b17f4573ba
author José Adolfo Galdámez <josegalre@pac-rom.com> Sat Jun 20 23:45:36 2015 -0600
committer William Bellavance <flintman@flintmancomputers.com> Wed Feb 10 20:02:51 2016 -0500
tree e7c8e6e70ad09ecc74c7385269f9a7a908489b88
parent 3591a444f6b8cb82a9b88a49a4e67d8f4b61a6de

Merge tag 'v3.4.108' into mm-6.0

Change-Id: I5ee718e5c87c9647c6edf0926a887679e065a649
Signed-off-by: José Adolfo Galdámez <josegalre@pac-rom.com>

drivers/scsi/scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ac99b46..a30f7a0 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1209,9 +1209,11 @@
 				    "rejecting I/O to dead device\n");
 			ret = BLKPREP_KILL;
 			break;
-		case SDEV_QUIESCE:
 		case SDEV_BLOCK:
 		case SDEV_CREATED_BLOCK:
+			ret = BLKPREP_DEFER;
+			break;
+		case SDEV_QUIESCE:
 			/*
 			 * If the devices is blocked we defer normal commands.
 			 */