mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' into export-slabh
This commit is contained in:
commit
336f5899d2
183 changed files with 4561 additions and 2618 deletions
|
|
@ -1370,6 +1370,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;
|
||||
|
|
@ -1458,6 +1464,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
|
|||
}
|
||||
}
|
||||
|
||||
if (disable_clock)
|
||||
clk_off(udc);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/clk.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue