cxgb4i: fix tx immediate data credit check

[cascardo/linux.git] / drivers / scsi / sr_ioctl.c

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 6389fcf..fb929fa 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -246,7 +246,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                                          "CDROM not ready.  Make sure there "
                                          "is a disc in the drive.\n");
 #ifdef DEBUG
-                       scsi_print_sense_hdr("sr", &sshdr);
+                       scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
 #endif
                        err = -ENOMEDIUM;
                        break;
@@ -257,15 +257,15 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                                /* sense: Invalid command operation code */
                                err = -EDRIVE_CANT_DO_THIS;
 #ifdef DEBUG
-                       __scsi_print_command(cgc->cmd);
-                       scsi_print_sense_hdr("sr", &sshdr);
+                       __scsi_print_command(cgc->cmd, CDROM_PACKET_SIZE);
+                       scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
 #endif
                        break;
                default:
                        sr_printk(KERN_ERR, cd,
                                  "CDROM (ioctl) error, command: ");
-                       __scsi_print_command(cgc->cmd);
-                       scsi_print_sense_hdr("sr", &sshdr);
+                       __scsi_print_command(cgc->cmd, CDROM_PACKET_SIZE);
+                       scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
                        err = -EIO;
                }
        }