1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 6a3f6aae8a97..0bba7d8eebb0 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -122,13 +122,9 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                                 break;
                         }
                 default:        /* Fall through for non-removable media */
-                        printk(KERN_INFO "ioctl_internal_command: <%d %d %d "
-                               "%d> return code = %x\n",
-                               sdev->host->host_no,
-                               sdev->channel,
-                               sdev->id,
-                               sdev->lun,
-                               result);
+                        sdev_printk(KERN_INFO, sdev,
+                                    "ioctl_internal_command return code = %x\n",
+                                    result);
                         scsi_print_sense_hdr("   ", &sshdr);
                         break;
                 }
@@ -282,7 +278,7 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
          * Obtain the data to be sent to the device (if any).
          */
 
-        if(copy_from_user(buf, cmd_in + cmdlen, inlen))
+        if(inlen && copy_from_user(buf, cmd_in + cmdlen, inlen))
                 goto error;
 
         switch (opcode) {
@@ -326,7 +322,7 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
                 if (copy_to_user(cmd_in, sense, sb_len))
                         result = -EFAULT;
         } else {
-                if (copy_to_user(cmd_in, buf, outlen))
+                if (outlen && copy_to_user(cmd_in, buf, outlen))
                         result = -EFAULT;
         }