diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2003-12-18 05:34:30 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2003-12-18 05:34:30 -0800 |
| commit | c0fbf5b63f0dc25938f7012bcf9cc54aa4eeb494 (patch) | |
| tree | 5ca8a6f80f7bff4d25187f34afee08b495dca1cb /drivers/input/mouse/synaptics.c | |
| parent | 0f40c9947348940bb39ed32b8fce426ed1072689 (diff) | |
[PATCH] Input: add psmouse_proto parameter
New parameter psmouse_proto to replace psmouse_noext. Allows to specify
highest PS/2 protocol extension that kernel has permission to negotiate
(bare|imps|exps). psmouse_noext marked as deprecated and emits a warning
when used. parameter parsing converted to the new scheme.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 439416d8dd2d..82f6b00ec234 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -377,7 +377,7 @@ static int synaptics_reconnect(struct psmouse *psmouse) struct synaptics_data *priv = psmouse->private; struct synaptics_data old_priv = *priv; - if (synaptics_detect(psmouse)) + if (!synaptics_detect(psmouse)) return -1; if (synaptics_query_hardware(psmouse)) { @@ -411,7 +411,7 @@ int synaptics_detect(struct psmouse *psmouse) psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); - return param[1] == 0x47 ? 0 : -1; + return param[1] == 0x47; } int synaptics_init(struct psmouse *psmouse) |
