patch-2.2.8 linux/drivers/scsi/scsi_ioctl.c

• Lines: 20
• Date: Thu Apr 29 11:53:41 1999
• Orig file: v2.2.7/linux/drivers/scsi/scsi_ioctl.c
• Orig date: Wed Sep 9 14:51:09 1998

diff -u --recursive --new-file v2.2.7/linux/drivers/scsi/scsi_ioctl.c linux/drivers/scsi/scsi_ioctl.c
@@ -131,15 +131,16 @@
 	    else printk("SCSI device (ioctl) reports ILLEGAL REQUEST.\n");
 	    break;
 	case NOT_READY: /* This happens if there is no disc in drive */
-	    if(dev->removable){
+	    if(dev->removable && (cmd[0] != TEST_UNIT_READY)){
 		printk(KERN_INFO "Device not ready.  Make sure there is a disc in the drive.\n");
 		break;
-	    };
+	    }
 	case UNIT_ATTENTION:
 	    if (dev->removable){
 		dev->changed = 1;
 		SCpnt->result = 0; /* This is no longer considered an error */
-		printk(KERN_INFO "Disc change detected.\n");
+		/* gag this error, VFS will log it anyway /axboe */
+		/* printk(KERN_INFO "Disc change detected.\n"); */
 		break;
 	    };
 	default: /* Fall through for non-removable media */