From 6bb48a83a0f2bdc4bd61fb47f6346c2f677997da Mon Sep 17 00:00:00 2001 From: Vikas Chaudhary Date: Thu, 9 Aug 2012 04:51:30 -0400 Subject: [PATCH] --- yaml --- r: 328802 b: refs/heads/master c: 0e58076b376824875e7e509b8dd352377a41cbbc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff9d70fb1fac..1b7da7747e68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d53efb9d518fbc795f79c676649e0ba311838e3a +refs/heads/master: 0e58076b376824875e7e509b8dd352377a41cbbc diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index ffd77739ae3e..4ba37198e069 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -2470,7 +2470,8 @@ scsi_internal_device_unblock(struct scsi_device *sdev, * Try to transition the scsi device to SDEV_RUNNING or one of the * offlined states and goose the device queue if successful. */ - if (sdev->sdev_state == SDEV_BLOCK) + if ((sdev->sdev_state == SDEV_BLOCK) || + (sdev->sdev_state == SDEV_TRANSPORT_OFFLINE)) sdev->sdev_state = new_state; else if (sdev->sdev_state == SDEV_CREATED_BLOCK) { if (new_state == SDEV_TRANSPORT_OFFLINE ||