Merge branch 'devel-stable' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index b3bd22ef82ba..eaa79c8a9b8c 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1377,6 +1377,12 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
 {
         struct at91_udc         *udc = _udc;
         u32                     rescans = 5;
+        int                     disable_clock = 0;
+
+        if (!udc->clocked) {
+                clk_on(udc);
+                disable_clock = 1;
+        }
 
         while (rescans--) {
                 u32 status;
@@ -1465,6 +1471,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
                 }
         }
 
+        if (disable_clock)
+                clk_off(udc);
+
         return IRQ_HANDLED;
 }