diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 15:22:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-16 15:22:40 (GMT) |
| commit | cc10b6ffd39ef982f86de68d95e5811df82cf819 (patch) | |
| tree | cb6f24f40d0211513321b5230b87efc022aeed1f /drivers/input | |
| parent | 042bd1ff6cf255e71689db913786dbb6bb79542d (diff) | |
| parent | 5b39187fad6faefae5ce1a1e997651d4e382b135 (diff) | |
| download | linux-cc10b6ffd39ef982f86de68d95e5811df82cf819.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: w90p910_ts - fix call to setup_timer()
Input: synaptics - fix wrong dimensions check
Input: i8042 - mark stubs in i8042.h "static inline"
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 1 | ||||
| -rw-r--r-- | drivers/input/touchscreen/w90p910_ts.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 40cea33..9ba9c4a 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -206,6 +206,7 @@ static int synaptics_resolution(struct psmouse *psmouse) unsigned char max[3]; if (SYN_ID_MAJOR(priv->identity) < 4) + return 0; if (synaptics_send_cmd(psmouse, SYN_QUE_RESOLUTION, res) == 0) { if (res[0] != 0 && (res[1] & 0x80) && res[2] != 0) { diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c index cc18265b..7a45d68 100644 --- a/drivers/input/touchscreen/w90p910_ts.c +++ b/drivers/input/touchscreen/w90p910_ts.c @@ -233,7 +233,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev) w90p910_ts->state = TS_IDLE; spin_lock_init(&w90p910_ts->lock); setup_timer(&w90p910_ts->timer, w90p910_check_pen_up, - (unsigned long)&w90p910_ts); + (unsigned long)w90p910_ts); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { |