The patch titled
wm97xx: fix logic typo when clearing GPIO function
has been removed from the -mm tree. Its filename was
input-core-driver-for-wm97xx-touchscreens-update-fix-typo.patch
This patch was dropped because it was folded into input-core-driver-for-wm97xx-touchscreens.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: wm97xx: fix logic typo when clearing GPIO function
From: Hans-Christian Egtvedt <hcegtvedt@xxxxxxxxx>
Fix a typo when the core part of the wm97xx touch driver tries to clear the
GPIO functionality for a GPIO line.
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/touchscreen/wm97xx-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/input/touchscreen/wm97xx-core.c~input-core-driver-for-wm97xx-touchscreens-update-fix-typo drivers/input/touchscreen/wm97xx-core.c
--- a/drivers/input/touchscreen/wm97xx-core.c~input-core-driver-for-wm97xx-touchscreens-update-fix-typo
+++ a/drivers/input/touchscreen/wm97xx-core.c
@@ -358,7 +358,7 @@ static int wm97xx_init_pen_irq(struct wm
BUG_ON(!wm->mach_ops->irq_gpio);
reg = wm97xx_reg_read(wm, AC97_MISC_AFE);
wm97xx_reg_write(wm, AC97_MISC_AFE,
- reg ^ wm->mach_ops->irq_gpio);
+ reg & ~(wm->mach_ops->irq_gpio));
reg = wm97xx_reg_read(wm, 0x5a);
wm97xx_reg_write(wm, 0x5a, reg & ~0x0001);
}
_
Patches currently in -mm which might be from hcegtvedt@xxxxxxxxx are
git-alsa.patch
git-avr32.patch
input-core-driver-for-wm97xx-touchscreens.patch
input-core-driver-for-wm97xx-touchscreens-update-fix-typo.patch
input-driver-for-wm97xx-touchscreens-in-streaming-mode-on-mainstone-update.patch
ps-2-serio-driver-for-avr32-devices.patch
ps-2-serio-driver-for-avr32-devices-fix.patch
at73c213-fix-error-checking-for-clk-api.patch
at73c213-monaural-support.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
