diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-21 21:45:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-21 21:45:08 +0200 |
| commit | dca45ad8af54963c005393a484ad117b8ba6150f (patch) | |
| tree | 7c9a6966283a6bb12b54e5680a67d203be292930 /drivers/input/mouse/synaptics.c | |
| parent | 68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad (diff) | |
| parent | cd5b8f8755a89a57fc8c408d284b8b613f090345 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 40cea334ad1..9ba9c4a17e1 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) { |