5 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index 7a133631bc2b..c9fa3bf5b377 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -2923,7 +2923,7 @@ static irqreturn_t langwell_irq(int irq, void *_dev)
                 handle_port_change(dev);
         }
 
-        /* suspend interrrupt */
+        /* suspend interrupt */
         if (irq_sts & STS_SLI) {
                 dev_vdbg(&dev->pdev->dev, "suspend interrupt\n");
                 handle_bus_suspend(dev);
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index fbed5d08beee..892412103dd8 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -377,7 +377,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
         } else {
                 /* Write dQH next pointer and terminate bit to 0 */
                 dqh->next_dtd_ptr = req->head->td_dma
-                        & EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
+                        & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
                 dqh->size_ioc_int_sts = 0;
 
                 /* Ensure that updates to the QH will occur before priming. */
@@ -418,7 +418,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
                 }
         }
 done:
-        return retval;;
+        return retval;
 }
 
 static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length,
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 2680fcc011d4..7f1bc9a73cda 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2446,7 +2446,7 @@ static void handle_stat1_irqs (struct net2280 *dev, u32 stat)
         mask = (1 << HIGH_SPEED) | (1 << FULL_SPEED);
 
         /* VBUS disconnect is indicated by VBUS_PIN and VBUS_INTERRUPT set.
-         * Root Port Reset is indicated by ROOT_PORT_RESET_INTERRRUPT set and
+         * Root Port Reset is indicated by ROOT_PORT_RESET_INTERRUPT set and
          * both HIGH_SPEED and FULL_SPEED clear (as ROOT_PORT_RESET_INTERRUPT
          * only indicates a change in the reset state).
          */
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
index b80d5143b279..bc78c606c12b 100644
--- a/drivers/usb/gadget/uvc.h
+++ b/drivers/usb/gadget/uvc.h
@@ -55,6 +55,7 @@ struct uvc_event
 #include <linux/usb.h>  /* For usb_endpoint_* */
 #include <linux/usb/gadget.h>
 #include <linux/videodev2.h>
+#include <linux/version.h>
 #include <media/v4l2-fh.h>
 
 #include "uvc_queue.h"
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index 927291c8087c..f6e083b50191 100644
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/version.h>
 #include <linux/videodev2.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>