aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sr_ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sr_ioctl.c')
-rw-r--r--drivers/scsi/sr_ioctl.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index e8deb9ccf20d..03054c0e7689 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -188,7 +188,6 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
188 struct scsi_sense_hdr sshdr; 188 struct scsi_sense_hdr sshdr;
189 int result, err = 0, retries = 0; 189 int result, err = 0, retries = 0;
190 struct request_sense *sense = cgc->sense; 190 struct request_sense *sense = cgc->sense;
191 char logbuf[SCSI_LOG_BUFSIZE];
192 191
193 SDev = cd->device; 192 SDev = cd->device;
194 193
@@ -246,9 +245,6 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
246 sr_printk(KERN_INFO, cd, 245 sr_printk(KERN_INFO, cd,
247 "CDROM not ready. Make sure there " 246 "CDROM not ready. Make sure there "
248 "is a disc in the drive.\n"); 247 "is a disc in the drive.\n");
249#ifdef DEBUG
250 scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
251#endif
252 err = -ENOMEDIUM; 248 err = -ENOMEDIUM;
253 break; 249 break;
254 case ILLEGAL_REQUEST: 250 case ILLEGAL_REQUEST:
@@ -257,22 +253,8 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
257 sshdr.ascq == 0x00) 253 sshdr.ascq == 0x00)
258 /* sense: Invalid command operation code */ 254 /* sense: Invalid command operation code */
259 err = -EDRIVE_CANT_DO_THIS; 255 err = -EDRIVE_CANT_DO_THIS;
260#ifdef DEBUG
261 __scsi_format_command(logbuf, sizeof(logbuf),
262 cgc->cmd, CDROM_PACKET_SIZE);
263 sr_printk(KERN_INFO, cd,
264 "CDROM (ioctl) invalid command: %s\n",
265 logbuf);
266 scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
267#endif
268 break; 256 break;
269 default: 257 default:
270 __scsi_format_command(logbuf, sizeof(logbuf),
271 cgc->cmd, CDROM_PACKET_SIZE);
272 sr_printk(KERN_ERR, cd,
273 "CDROM (ioctl) error, command: %s\n",
274 logbuf);
275 scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
276 err = -EIO; 258 err = -EIO;
277 } 259 }
278 } 260 }