diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
| commit | fa8c4bd898c720c5a2186c9c8cb7cf80885aa6df (patch) | |
| tree | 4f70fd5bae3a6e895b96e3dcca4a26c9917ebd9b /drivers/scsi/device_handler | |
| parent | 99542137b908ab89180986de6fb75532ad765688 (diff) | |
| parent | c6092bb74442d4ee1dfea60e2934915836f53528 (diff) | |
Merge branch 'tracking-linux-3.6.y' into merge-linux-linaro-core-trackingllct-20121012.0linux-linaro-core-tracking-3.6-2012.10
Diffstat (limited to 'drivers/scsi/device_handler')
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh_alua.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index 08d80a6d272a..6f4d8e6f32f1 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c @@ -641,8 +641,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) h->state = TPGS_STATE_STANDBY; break; case TPGS_STATE_OFFLINE: - case TPGS_STATE_UNAVAILABLE: - /* Path unusable for unavailable/offline */ + /* Path unusable */ err = SCSI_DH_DEV_OFFLINED; break; default: |