On Thu, Feb 21, 2013 at 12:02:46PM -0800, Kamal Mostafa wrote: > On Thu, 2013-02-21 at 11:56 -0800, Dmitry Torokhov wrote: > > On Thu, Feb 21, 2013 at 10:55:55AM -0800, Kamal Mostafa wrote: > > > Avoid firmware glitch in Cypress PS/2 Trackpad firmware version 11 > > > (as observed in Dell XPS12) which prevents driver from recognizing > > > the trackpad. > > > > > > BugLink: http://launchpad.net/bugs/1103594 > > > > > > Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx> > > > Cc: Dudley Du <dudl@xxxxxxxxxxx> > > > --- > > > drivers/input/mouse/cypress_ps2.c | 19 +++++++++++++------ > > > 1 file changed, 13 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/input/mouse/cypress_ps2.c b/drivers/input/mouse/cypress_ps2.c > > > index 1673dc6..f51765f 100644 > > > --- a/drivers/input/mouse/cypress_ps2.c > > > +++ b/drivers/input/mouse/cypress_ps2.c > > > @@ -236,6 +236,13 @@ static int cypress_read_fw_version(struct psmouse *psmouse) > > > cytp->fw_version = param[2] & FW_VERSION_MASX; > > > cytp->tp_metrics_supported = (param[2] & TP_METRICS_MASK) ? 1 : 0; > > > > > > + /* > > > + * Trackpad fw_version 11 (in Dell XPS12) yields a bogus response to > > > + * CYTP_CMD_READ_TP_METRICS so do not try to use it. LP: #1103594. > > > + */ > > > + if (cytp->fw_version >= 11) > > > + cytp->tp_metrics_supported = 0; > > > + > > > > Isn't this the only chunk that is actually needed to fix the issue? > > No, the other parts are needed also: The handling of > tp_metrics_supported gets moved so that the default values now get set > first, then overridden only if tp_metrics_supported is true. > Previously, the defaults wouldn't get set if it wasn't true (which was a > bug that never manifested). OK, fair enough. BTW, can you tell me what server you published your PGP key to? It does not seem to be present on the usual ones... Thanks, Dmitry -- 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
