5 files changed, 9 insertions, 8 deletions

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index e7c65a4408fb..db1a659702ba 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -2095,6 +2095,6 @@ static void __exit udc_exit(void)
 module_exit(udc_exit);
 
 MODULE_DESCRIPTION("Atmel USBA UDC driver");
-MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
+MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:atmel_usba_udc");
diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c
index 512f647448ca..6d7533427163 100644
--- a/drivers/usb/host/imx21-dbg.c
+++ b/drivers/usb/host/imx21-dbg.c
@@ -384,7 +384,7 @@ static void debug_isoc_show_one(struct seq_file *s,
         seq_printf(s, "%s %d:\n"
                 "cc=0X%02X\n"
                 "scheduled frame %d (%d)\n"
-                "submittted frame %d (%d)\n"
+                "submitted frame %d (%d)\n"
                 "completed frame %d (%d)\n"
                 "requested length=%d\n"
                 "completed length=%d\n\n",
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 4f65b14e5e08..448b9d1f0e70 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -53,9 +53,10 @@
 /*
  * Version Information
  */
-#define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \
-Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \
-Alan Stern"
+#define DRIVER_AUTHOR                                                   \
+        "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, "             \
+        "Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, "       \
+        "Roman Weissgaerber, Alan Stern"
 #define DRIVER_DESC "USB Universal Host Controller Interface driver"
 
 /* for flakey hardware, ignore overcurrent indicators */
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 388cc128072a..ff9a01f8d405 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -104,7 +104,7 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf)
                 alt = intf->altsetting + tmp;
 
                 /* take the first altsetting with in-bulk + out-bulk;
-                 * ignore other endpoints and altsetttings.
+                 * ignore other endpoints and altsettings.
                  */
                 for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) {
                         struct usb_host_endpoint        *e;
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 0e5aafda4537..31645afff5fc 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -715,8 +715,8 @@ static int ene_ub6250_probe(struct usb_interface *intf,
 
         if (!(misc_reg03 & 0x01)) {
                 result = -ENODEV;
-                printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD\
-                card. To use SM/MS card, please build driver/stagging/keucr\n");
+                printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD card. "
+                       "To use SM/MS card, please build driver/staging/keucr\n");
                 usb_stor_disconnect(intf);
         }