From c870a3f7a24ad188631f38029d86944e07bcfb79 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 27 Dec 2011 17:20:10 +0000 Subject: [PATCH] --- yaml --- r: 284592 b: refs/heads/master c: 953c7d025d97916e56fd6f1bd347e1c19fd7d5f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm831x-irq.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb005e35bbe4..c908ce93d551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3380333b8fdaad07d53953c1831b90d9cc23821 +refs/heads/master: 953c7d025d97916e56fd6f1bd347e1c19fd7d5f5 diff --git a/trunk/drivers/mfd/wm831x-irq.c b/trunk/drivers/mfd/wm831x-irq.c index 7be5f09f4fcf..bec4d0539160 100644 --- a/trunk/drivers/mfd/wm831x-irq.c +++ b/trunk/drivers/mfd/wm831x-irq.c @@ -472,8 +472,7 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data) handle_nested_irq(wm831x->irq_base + WM831X_IRQ_TCHPD); if (primary & WM831X_TCHDATA_INT) handle_nested_irq(wm831x->irq_base + WM831X_IRQ_TCHDATA); - if (primary & (WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT)) - goto out; + primary &= ~(WM831X_TCHDATA_EINT | WM831X_TCHPD_EINT); for (i = 0; i < ARRAY_SIZE(wm831x_irqs); i++) { int offset = wm831x_irqs[i].reg - 1;