1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ee6be596503d..762a8797e0be 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -664,13 +664,14 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
                 goto out;
         }
 
-        /* Check to see if the scsi lld put this device into state SDEV_BLOCK. */
-        if (unlikely(cmd->device->sdev_state == SDEV_BLOCK)) {
+        /* Check to see if the scsi lld made this device blocked. */
+        if (unlikely(scsi_device_blocked(cmd->device))) {
                 /* 
-                 * in SDEV_BLOCK, the command is just put back on the device
-                 * queue.  The suspend state has already blocked the queue so
-                 * future requests should not occur until the device 
-                 * transitions out of the suspend state.
+                 * in blocked state, the command is just put back on
+                 * the device queue.  The suspend state has already
+                 * blocked the queue so future requests should not
+                 * occur until the device transitions out of the
+                 * suspend state.
                  */
                 scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);