diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 03:55:12 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 03:55:12 -0400 |
| commit | fe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch) | |
| tree | c5a7fd72a745a5f6656a58acc9a1d277e26f9595 /drivers/scsi/scsi_lib.c | |
| parent | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (diff) | |
| parent | 0644f5393e915f13733bcc65f13195ff39aeb63e (diff) | |
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index faa790fba134..da36a3a81a9e 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -2473,7 +2473,8 @@ scsi_internal_device_unblock(struct scsi_device *sdev, | |||
| 2473 | * Try to transition the scsi device to SDEV_RUNNING or one of the | 2473 | * Try to transition the scsi device to SDEV_RUNNING or one of the |
| 2474 | * offlined states and goose the device queue if successful. | 2474 | * offlined states and goose the device queue if successful. |
| 2475 | */ | 2475 | */ |
| 2476 | if (sdev->sdev_state == SDEV_BLOCK) | 2476 | if ((sdev->sdev_state == SDEV_BLOCK) || |
| 2477 | (sdev->sdev_state == SDEV_TRANSPORT_OFFLINE)) | ||
| 2477 | sdev->sdev_state = new_state; | 2478 | sdev->sdev_state = new_state; |
| 2478 | else if (sdev->sdev_state == SDEV_CREATED_BLOCK) { | 2479 | else if (sdev->sdev_state == SDEV_CREATED_BLOCK) { |
| 2479 | if (new_state == SDEV_TRANSPORT_OFFLINE || | 2480 | if (new_state == SDEV_TRANSPORT_OFFLINE || |