Messages in this thread Patch in this message | | | From | Vojtech Pavlik <> | Date | Mon, 7 Jun 2004 13:55:54 +0200 | Subject | [PATCH 32/39] input: Do not call synaptics_init unless we are ready to do full mouse setup |
| |
You can pull this changeset from: bk://kernel.bkbits.net/vojtech/input-for-linus
===================================================================
ChangeSet@1.1587.27.12, 2004-05-10 01:37:47-05:00, dtor_core@ameritech.net Input: do not call synaptics_init unless we are ready to do full mouse setup
psmouse-base.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
===================================================================
diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c --- a/drivers/input/mouse/psmouse-base.c 2004-06-07 13:10:55 +02:00 +++ b/drivers/input/mouse/psmouse-base.c 2004-06-07 13:10:55 +02:00 @@ -427,7 +427,7 @@ } if (max_proto > PSMOUSE_IMEX) { - if (synaptics_init(psmouse) == 0) + if (!set_properties || synaptics_init(psmouse) == 0) return PSMOUSE_SYNAPTICS; /* * Some Synaptics touchpads can emulate extended protocols (like IMPS/2). - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |