Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / lpc32xx_udc.c

diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 049ebab0d3607e7719843335c14201878df285c2..e471580a2a3bee941ca5b4a251c618215b242105 100644 (file)
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -55,7 +55,6 @@
 #include <mach/hardware.h>
 #include <linux/io.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 
 #include <mach/platform.h>
 #include <mach/irqs.h>
@@ -3295,9 +3294,9 @@ usb_clk_enable_fail:
 pll_set_fail:
        clk_disable(udc->usb_pll_clk);
 pll_enable_fail:
-       clk_put(udc->usb_slv_clk);
-usb_otg_clk_get_fail:
        clk_put(udc->usb_otg_clk);
+usb_otg_clk_get_fail:
+       clk_put(udc->usb_slv_clk);
 usb_clk_get_fail:
        clk_put(udc->usb_pll_clk);
 pll_get_fail: