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

• Lines: 16
• Date: Thu Nov 28 15:53:14 2002
• Orig file: linux-2.4.19/drivers/scsi/sr_ioctl.c
• Orig date: Fri Aug 2 17:39:44 2002

diff -urN linux-2.4.19/drivers/scsi/sr_ioctl.c linux-2.4.20/drivers/scsi/sr_ioctl.c
@@ -158,13 +158,11 @@
 			if (!quiet)
 				printk(KERN_ERR "sr%d: CDROM (ioctl) reports ILLEGAL "
 				       "REQUEST.\n", target);
+			err = -EIO;
 			if (SRpnt->sr_sense_buffer[12] == 0x20 &&
-			    SRpnt->sr_sense_buffer[13] == 0x00) {
+			    SRpnt->sr_sense_buffer[13] == 0x00)
 				/* sense: Invalid command operation code */
 				err = -EDRIVE_CANT_DO_THIS;
-			} else {
-				err = -EINVAL;
-			}
 #ifdef DEBUG
 			print_command(sr_cmd);
 			print_req_sense("sr", SRpnt);