Commit 47c6252f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Vojtech Pavlik

Input: do not call synaptics_init unless we are ready to do full

       mouse setup
parent 4081c205
...@@ -427,7 +427,7 @@ static int psmouse_extensions(struct psmouse *psmouse, ...@@ -427,7 +427,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
} }
if (max_proto > PSMOUSE_IMEX) { if (max_proto > PSMOUSE_IMEX) {
if (synaptics_init(psmouse) == 0) if (!set_properties || synaptics_init(psmouse) == 0)
return PSMOUSE_SYNAPTICS; return PSMOUSE_SYNAPTICS;
/* /*
* Some Synaptics touchpads can emulate extended protocols (like IMPS/2). * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment