Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)

[karo-tx-linux.git] / drivers / usb / storage / jumpshot.c

diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index ee613e258db0e9c17f617971790b0495c9677fc7..011e5270690a86e396fa8bf627e6022bfcbaa75f 100644 (file)
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -1,4 +1,5 @@
-/* Driver for Lexar "Jumpshot" Compact Flash reader
+/*
+ * Driver for Lexar "Jumpshot" Compact Flash reader
  *
  * jumpshot driver v0.1:
  *
@@ -618,18 +619,23 @@ static int jumpshot_transport(struct scsi_cmnd *srb, struct us_data *us)
        }
 
        if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) {
-               // sure.  whatever.  not like we can stop the user from popping
-               // the media out of the device (no locking doors, etc)
-               //
+               /*
+                * sure.  whatever.  not like we can stop the user from popping
+                * the media out of the device (no locking doors, etc)
+                */
                return USB_STOR_TRANSPORT_GOOD;
        }
 
        if (srb->cmnd[0] == START_STOP) {
-               /* this is used by sd.c'check_scsidisk_media_change to detect
-                  media change */
+               /*
+                * this is used by sd.c'check_scsidisk_media_change to detect
+                * media change
+                */
                usb_stor_dbg(us, "START_STOP\n");
-               /* the first jumpshot_id_device after a media change returns
-                  an error (determined experimentally) */
+               /*
+                * the first jumpshot_id_device after a media change returns
+                * an error (determined experimentally)
+                */
                rc = jumpshot_id_device(us, info);
                if (rc == USB_STOR_TRANSPORT_GOOD) {
                        info->sense_key = NO_SENSE;