diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /drivers/scsi/scsi_ioctl.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index a89c4115cfb..32293f45166 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
| @@ -110,11 +110,8 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd, | |||
| 110 | sshdr.asc, sshdr.ascq); | 110 | sshdr.asc, sshdr.ascq); |
| 111 | break; | 111 | break; |
| 112 | case NOT_READY: /* This happens if there is no disc in drive */ | 112 | case NOT_READY: /* This happens if there is no disc in drive */ |
| 113 | if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) { | 113 | if (sdev->removable) |
| 114 | printk(KERN_INFO "Device not ready. Make sure" | ||
| 115 | " there is a disc in the drive.\n"); | ||
| 116 | break; | 114 | break; |
| 117 | } | ||
| 118 | case UNIT_ATTENTION: | 115 | case UNIT_ATTENTION: |
| 119 | if (sdev->removable) { | 116 | if (sdev->removable) { |
| 120 | sdev->changed = 1; | 117 | sdev->changed = 1; |