diff options
| -rw-r--r-- | drivers/scsi/sr.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d7b383c96d5d..c7e29bdec2cd 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -214,13 +214,17 @@ static int sr_media_change(struct cdrom_device_info *cdi, int slot) | |||
| 214 | 214 | ||
| 215 | sshdr = kzalloc(sizeof(*sshdr), GFP_KERNEL); | 215 | sshdr = kzalloc(sizeof(*sshdr), GFP_KERNEL); |
| 216 | retval = sr_test_unit_ready(cd->device, sshdr); | 216 | retval = sr_test_unit_ready(cd->device, sshdr); |
| 217 | if (retval || (scsi_sense_valid(sshdr) && | 217 | /* |
| 218 | /* 0x3a is medium not present */ | 218 | * Media is considered to be present if TUR succeeds or fails with |
| 219 | sshdr->asc == 0x3a)) { | 219 | * sense data indicating something other than media-not-present |
| 220 | /* Media not present or unable to test, unit probably not | 220 | * (ASC 0x3a). |
| 221 | * ready. This usually means there is no disc in the drive. | 221 | */ |
| 222 | * Mark as changed, and we will figure it out later once | 222 | if (!scsi_status_is_good(retval) && |
| 223 | * the drive is available again. | 223 | (!scsi_sense_valid(sshdr) || sshdr->asc == 0x3a)) { |
| 224 | /* | ||
| 225 | * Probably no media in the device. Mark as changed, and | ||
| 226 | * we will figure it out later once the drive is available | ||
| 227 | * again. | ||
| 224 | */ | 228 | */ |
| 225 | cd->device->changed = 1; | 229 | cd->device->changed = 1; |
| 226 | /* This will force a flush, if called from check_disk_change */ | 230 | /* This will force a flush, if called from check_disk_change */ |