1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index bb218c8b6e98..27dbf2e8e34a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2441,20 +2441,18 @@ int
 scsi_internal_device_unblock(struct scsi_device *sdev)
 {
         struct request_queue *q = sdev->request_queue; 
-        int err;
         unsigned long flags;
         
         /* 
          * Try to transition the scsi device to SDEV_RUNNING
          * and goose the device queue if successful.  
          */
-        err = scsi_device_set_state(sdev, SDEV_RUNNING);
-        if (err) {
-                err = scsi_device_set_state(sdev, SDEV_CREATED);
-
-                if (err)
-                        return err;
-        }
+        if (sdev->sdev_state == SDEV_BLOCK)
+                sdev->sdev_state = SDEV_RUNNING;
+        else if (sdev->sdev_state == SDEV_CREATED_BLOCK)
+                sdev->sdev_state = SDEV_CREATED;
+        else
+                return -EINVAL;
 
         spin_lock_irqsave(q->queue_lock, flags);
         blk_start_queue(q);