Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index 93c1a4d86f51..82dd834709c7 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -59,7 +59,9 @@
 
 void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
 {
-        /* Pad the SCSI command with zeros out to 12 bytes
+        /*
+         * Pad the SCSI command with zeros out to 12 bytes.  If the
+         * command already is 12 bytes or longer, leave it alone.
          *
          * NOTE: This only works because a scsi_cmnd struct field contains
          * a unsigned char cmnd[16], so we know we have storage available
@@ -67,9 +69,6 @@ void usb_stor_pad12_command(struct scsi_cmnd *srb, struct us_data *us)
         for (; srb->cmd_len<12; srb->cmd_len++)
                 srb->cmnd[srb->cmd_len] = 0;
 
-        /* set command length to 12 bytes */
-        srb->cmd_len = 12;
-
         /* send the command to the transport layer */
         usb_stor_invoke_transport(srb, us);
 }