git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
atmel-wm97xx.c
diff --git
a/drivers/input/touchscreen/atmel-wm97xx.c
b/drivers/input/touchscreen/atmel-wm97xx.c
index
fa8e56b
..
8034cbb
100644
(file)
--- a/
drivers/input/touchscreen/atmel-wm97xx.c
+++ b/
drivers/input/touchscreen/atmel-wm97xx.c
@@
-164,7
+164,7
@@
static irqreturn_t atmel_wm97xx_channel_b_interrupt(int irq, void *dev_id)
data = ac97c_readl(atmel_wm97xx, CBRHR);
value = data & 0x0fff;
data = ac97c_readl(atmel_wm97xx, CBRHR);
value = data & 0x0fff;
- source = data & WM97XX_ADCS
RC
_MASK;
+ source = data & WM97XX_ADCS
EL
_MASK;
pen_down = (data & WM97XX_PEN_DOWN) >> 8;
if (source == WM97XX_ADCSEL_X)
pen_down = (data & WM97XX_PEN_DOWN) >> 8;
if (source == WM97XX_ADCSEL_X)
@@
-442,6
+442,6
@@
static void __exit atmel_wm97xx_exit(void)
}
module_exit(atmel_wm97xx_exit);
}
module_exit(atmel_wm97xx_exit);
-MODULE_AUTHOR("Hans-Christian Egtvedt <
hans-christian.egtvedt@atmel.com
>");
+MODULE_AUTHOR("Hans-Christian Egtvedt <
egtvedt@samfundet.no
>");
MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32");
MODULE_LICENSE("GPL");