diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 15:18:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 15:18:24 +0800 |
| commit | 54db03197e2d0aca252bc377938777b30d3e7f10 (patch) | |
| tree | 8f078dfe75c88e09ae8557f8b6aa288bbdaddc97 /drivers/scsi/scsi_lib.c | |
| parent | 2075186d012c815911494f34fc16aef7c8f3492b (diff) | |
| parent | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index e5953c8018c5..9f3168e8e5a8 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1242,9 +1242,11 @@ int scsi_prep_state_check(struct scsi_device *sdev, struct request *req) "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. */ |