summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-07-28 09:04:09 +0200
committerJens Axboe <axboe@suse.de>2006-07-28 09:04:09 +0200
commita75ad3c27a6ad78c4306cac939938050dcde54f3 (patch)
tree3915e117ba018d83d5c764aff4c67d96665787b8 /drivers/scsi/scsi_ioctl.c
parent71ef51cc1756d1c56b57c70e7cc27a3559c81ee6 (diff)
downloadlinux-stable-a75ad3c27a6ad78c4306cac939938050dcde54f3.tar.gz
linux-stable-a75ad3c27a6ad78c4306cac939938050dcde54f3.tar.bz2
linux-stable-a75ad3c27a6ad78c4306cac939938050dcde54f3.zip
[PATCH] scsi: kill overeager "not-ready" messages
HAL and friends have a tendency to trigger this one all the time. It's not really interesting, so kill it. The vendor kernels all do anyways. Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
-rw-r--r--drivers/scsi/scsi_ioctl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index a89c4115cfba..32293f451669 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,
sshdr.asc, sshdr.ascq);
break;
case NOT_READY: /* This happens if there is no disc in drive */
- if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) {
- printk(KERN_INFO "Device not ready. Make sure"
- " there is a disc in the drive.\n");
+ if (sdev->removable)
break;
- }
case UNIT_ATTENTION:
if (sdev->removable) {
sdev->changed = 1;