On Thu, Sep 11, 2014 at 07:31:13PM +0200, Hans de Goede wrote: > Hi, > > On 09/11/2014 07:26 PM, Dmitry Torokhov wrote: > > Hi Hans, > > > > On Thu, Sep 11, 2014 at 10:50:47AM +0200, Hans de Goede wrote: > >> @@ -722,6 +723,13 @@ static int psmouse_extensions(struct psmouse *psmouse, > >> { > >> bool synaptics_hardware = false; > >> > >> +/* Always check for focaltech, this is safe as it uses pnp-id matching */ > >> + if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) { > >> + /* Not supported yet, use bare protocol */ > >> + psmouse_max_proto = max_proto = PSMOUSE_PS2; > >> + goto reset_to_defaults; > > > > Why do we need to jump to a new label instead of simply saying > > Once we had figured out that psmouse.proto=bare at least made this > touchpad work in mouse emulation mode, that is the first thing I did, but it > is not enough. We also need to set psmouse_max_proto to short-circuit > psmouse_initialize and do the reset. I'd rather we did the reset in focal_init() then. We'll need it anyway later. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html