patch-2.0.31 linux/drivers/scsi/sr_ioctl.c

• Lines: 11
• Date: Mon Sep 1 11:21:30 1997
• Orig file: v2.0.30/linux/drivers/scsi/sr_ioctl.c
• Orig date: Sat May 18 12:19:19 1996

diff -u --recursive --new-file v2.0.30/linux/drivers/scsi/sr_ioctl.c linux/drivers/scsi/sr_ioctl.c
@@ -66,7 +66,9 @@
 	    printk("CDROM not ready.  Make sure there is a disc in the drive.\n");
 	    break;
 	case ILLEGAL_REQUEST:
-	    printk("CDROM (ioctl) reports ILLEGAL REQUEST.\n");
+	  /* CDROMCLOSETRAY should not print an error for caddy drives. */
+	    if (!(sr_cmd[0] == START_STOP && sr_cmd[4] == 0x03))
+	      printk("CDROM (ioctl) reports ILLEGAL REQUEST.\n");
 	    break;
 	default:
 	    printk("SCSI CD error: host %d id %d lun %d return code = %03x\n",