diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 14:47:54 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 14:47:54 +0100 |
| commit | 81c5e2ae33c4b19e53966b427e33646bf6811830 (patch) | |
| tree | a602a6dd100165c8948bfa713e6f0b422dcba5d8 /drivers/scsi/scsi_lib.c | |
| parent | 797a455d2c682476c3797dbfecf5bf84c1e3b9d3 (diff) | |
| parent | fcc57045d53edc35bcce456e60ac4aa802712934 (diff) | |
| download | op-kernel-dev-81c5e2ae33c4b19e53966b427e33646bf6811830.zip op-kernel-dev-81c5e2ae33c4b19e53966b427e33646bf6811830.tar.gz | |
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index eafeeda..13bf891 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1984,8 +1984,7 @@ EXPORT_SYMBOL(scsi_mode_sense); * in. * * Returns zero if unsuccessful or an error if TUR failed. For - * removable media, a return of NOT_READY or UNIT_ATTENTION is - * translated to success, with the ->changed flag updated. + * removable media, UNIT_ATTENTION sets ->changed flag. **/ int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries, @@ -2012,16 +2011,6 @@ scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries, } while (scsi_sense_valid(sshdr) && sshdr->sense_key == UNIT_ATTENTION && --retries); - if (!sshdr) - /* could not allocate sense buffer, so can't process it */ - return result; - - if (sdev->removable && scsi_sense_valid(sshdr) && - (sshdr->sense_key == UNIT_ATTENTION || - sshdr->sense_key == NOT_READY)) { - sdev->changed = 1; - result = 0; - } if (!sshdr_external) kfree(sshdr); return result; |
