diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-27 17:20:10 +0000 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2012-01-09 00:37:47 +0100 |
| commit | 953c7d025d97916e56fd6f1bd347e1c19fd7d5f5 (patch) | |
| tree | 770134df40ea088076747b65283c84da6586aebe /drivers/mfd | |
| parent | mfd: Introduce missing kfree in 88pm860x probe routine (diff) | |
| download | linux-dev-953c7d025d97916e56fd6f1bd347e1c19fd7d5f5.tar.xz linux-dev-953c7d025d97916e56fd6f1bd347e1c19fd7d5f5.zip | |
mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
It is possible that we will see another interrupt triggering at the same
time as the touchscreen interrupts so it's still worth checking other
possible sources. Almost all of the win from the fast path comes from only
needing to read the primary register and saving the I/O costs.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/wm831x-irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c index 7be5f09f4fcf..bec4d0539160 100644 --- a/drivers/mfd/wm831x-irq.c +++ b/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; |