Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / emxx_udc / emxx_udc.c

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index 3b56b2826263951fb8fbc19fafaf082426dbc9a0..f6233ec5a3a243f3beb20c5965de1393b1d3b2eb 100644 (file)
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -131,7 +131,6 @@ static void _nbu2ss_dump_register(struct nbu2ss_udc *udc)
                reg_data =  _nbu2ss_readl(
                        (u32 *)IO_ADDRESS(USB_BASE_ADDRESS + i + 12));
                dev_dbg(&udc->dev, " %08x\n", (int)reg_data);
-
        }
 
        spin_lock(&udc->lock);
@@ -2264,9 +2263,7 @@ static int _nbu2ss_enable_controller(struct nbu2ss_udc *udc)
        if (udc->udc_enabled)
                return 0;
 
-       /*
-               Reset
-       */
+       /* Reset */
        _nbu2ss_bitset(&udc->p_regs->EPCTR, (DIRPD | EPC_RST));
        udelay(EPC_RST_DISABLE_TIME);   /* 1us wait */