xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.12-rc6' into devel

Browse Source 
Linux 3.12-rc6

Conflicts:
	drivers/gpio/gpio-lynxpoint.c
This commit is contained in:
Linus Walleij
2013-10-19 23:24:03 +02:00
parent 0963d59bc0 31d141e3a6
commit b41fb43911
266 changed files with 1808 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpio/gpio-lynxpoint.c
View File

@@ -248,13 +248,14 @@ static void lp_gpio_irq_handler(unsigned hwirq, struct irq_desc *desc)
struct lp_gpio *lg = irq_data_get_irq_handler_data(data);
struct irq_chip *chip = irq_data_get_irq_chip(data);
u32 base, pin, mask;
unsigned long reg, pending;
unsigned long reg, ena, pending;
/* check from GPIO controller which pin triggered the interrupt */
for (base = 0; base < lg->chip.ngpio; base += 32) {
reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT);
ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE);
while ((pending = inl(reg))) {
while ((pending = (inl(reg) & inl(ena)))) {
unsigned irq;
pin = __ffs(pending);