Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[pandora-kernel.git] / drivers / usb / gadget / mv_udc_core.c

diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index fbed5d0..8924121 100644 (file)
--- 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,