3 files changed, 16 insertions, 14 deletions

diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index 54cc94277acb..6542ca40d505 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -269,7 +269,7 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
         /* The firmware will time-out commands after 20 seconds. Some commands
          * can legitimately take longer than this, so we use a different
          * command that only waits for the interrupt and then sends status,
-         * without having to send a new ATAPI command to the device. 
+         * without having to send a new ATAPI command to the device.
          *
          * NOTE: There is some indication that a data transfer after a timeout
          * may not work, but that is a condition that should never happen.
@@ -324,14 +324,14 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
 
         /* Find the length we desire to read. */
         switch (srb->cmnd[0]) {
-                case INQUIRY:
-                case REQUEST_SENSE:             /* 16 or 18 bytes? spec says 18, lots of devices only have 16 */
-                case MODE_SENSE:
-                case MODE_SENSE_10:
-                        length = le16_to_cpu(fst->Count);
-                        break;
-                default:
-                        length = scsi_bufflen(srb);
+        case INQUIRY:
+        case REQUEST_SENSE:     /* 16 or 18 bytes? spec says 18, lots of devices only have 16 */
+        case MODE_SENSE:
+        case MODE_SENSE_10:
+                length = le16_to_cpu(fst->Count);
+                break;
+        default:
+                length = scsi_bufflen(srb);
         }
 
         /* verify that this amount is legal */
@@ -414,7 +414,7 @@ static int freecom_transport(struct scsi_cmnd *srb, struct us_data *us)
                 /* should never hit here -- filtered in usb.c */
                 US_DEBUGP ("freecom unimplemented direction: %d\n",
                                 us->srb->sc_data_direction);
-                // Return fail, SCSI seems to handle this better.
+                /* Return fail, SCSI seems to handle this better. */
                 return USB_STOR_TRANSPORT_FAILED;
                 break;
         }
@@ -494,8 +494,7 @@ static void pdump (void *ibuffer, int length)
                                 offset = 0;
                         }
                         offset += sprintf (line+offset, "%08x:", i);
-                }
-                else if ((i & 7) == 0) {
+                } else if ((i & 7) == 0) {
                         offset += sprintf (line+offset, " -");
                 }
                 offset += sprintf (line+offset, " %02x", buffer[i] & 0xff);
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index e9cbc1467f76..6b9982cd5423 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1456,8 +1456,7 @@ static int isd200_init_info(struct us_data *us)
         int retStatus = ISD200_GOOD;
         struct isd200_info *info;
 
-        info = (struct isd200_info *)
-                        kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
         if (!info)
                 retStatus = ISD200_ERROR;
         else {
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index a7d0bf9d92a7..90bb0175a152 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -336,6 +336,7 @@ static int usb_stor_control_thread(void * __us)
                 else {
                         US_DEBUG(usb_stor_show_command(us->srb));
                         us->proto_handler(us->srb, us);
+                        usb_mark_last_busy(us->pusb_dev);
                 }
 
                 /* lock access to the state */
@@ -845,6 +846,7 @@ static int usb_stor_scan_thread(void * __us)
                 /* Should we unbind if no devices were detected? */
         }
 
+        usb_autopm_put_interface(us->pusb_intf);
         complete_and_exit(&us->scanning_done, 0);
 }
 
@@ -968,6 +970,7 @@ int usb_stor_probe2(struct us_data *us)
                 goto BadDevice;
         }
 
+        usb_autopm_get_interface_no_resume(us->pusb_intf);
         wake_up_process(th);
 
         return 0;
@@ -1040,6 +1043,7 @@ static struct usb_driver usb_storage_driver = {
         .pre_reset =    usb_stor_pre_reset,
         .post_reset =   usb_stor_post_reset,
         .id_table =     usb_storage_usb_ids,
+        .supports_autosuspend = 1,
         .soft_unbind =  1,
 };