--- drivers/scsi/scsi_lib.c

+++ drivers/scsi/scsi_lib.c

@@ -2432,7 +2432,8 @@ scsi_internal_device_unblock(struct scsi

sdev->sdev_state = SDEV_RUNNING;

else if (sdev->sdev_state == SDEV_CREATED_BLOCK)

sdev->sdev_state = SDEV_CREATED;

- else

+ else if (sdev->sdev_state != SDEV_CANCEL &&

+ sdev->sdev_state != SDEV_OFFLINE)

return -EINVAL;

spin_lock_irqsave(q->queue_lock, flags);