From patchwork Sat May 8 16:01:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 97912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o48FtRde005969 for ; Sat, 8 May 2010 15:55:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752952Ab0EHPz0 (ORCPT ); Sat, 8 May 2010 11:55:26 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:41345 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058Ab0EHPzZ (ORCPT ); Sat, 8 May 2010 11:55:25 -0400 Received: by bwz19 with SMTP id 19so1052226bwz.21 for ; Sat, 08 May 2010 08:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=41vRlTdA55aV5l8nBLqAOI35l94mBaiL/tZFmtKbkJc=; b=uY6A1lo6QwpEAq6Y4KUSMbMaPHfrPPc7O39p8C5rCcG95GdRMbSRKQiA4eBgZFK/Bj jjNfJFXlG2jpbut3L9BvV0ihOqnxWZyw6KnnbHD4J3gtsQP//bR9CxbU55zLb0SvvCQe m1AwFuJJ0Sua83aZgcFEqLhahZ3cm/uNbbjM4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=YN0Pm/j5WiNtQLlUonK7dKMwdeoIb1QKvSzxdaQxDqulYrWUzxlnChpVAcH7OBNqIh xZhLXDfgwGenB7PNnSB54UFTK9hvBDPyilPyFPSB1yBUe8jbru3NJnC2G4NzxaFrccOy K3TZgFlMJiWK8f2Z0oGHpZag3n8CurysWGuWc= Received: by 10.204.49.212 with SMTP id w20mr441033bkf.144.1273334124244; Sat, 08 May 2010 08:55:24 -0700 (PDT) Received: from [192.168.1.4] (p3EE06B69.dip.t-dialin.net [62.224.107.105]) by mx.google.com with ESMTPS id 13sm1019513bwz.15.2010.05.08.08.55.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 08 May 2010 08:55:22 -0700 (PDT) Subject: Re: [PATCH] Reset ps/2 port should psmouse_probe fail before retrying From: Christoph Fritz To: "Peter M. Petrakis" Cc: Dmitry Torokhov , linux-input@vger.kernel.org, rubini , Christopher Heiny In-Reply-To: <4BE45474.8040001@canonical.com> References: <1271723857.6652.6.camel@lovely> <20100422215517.GB28213@core.coreip.homeip.net> <1271983668.16254.44.camel@lovely> <201004230953.52447.dmitry.torokhov@gmail.com> <4BD1EB1C.1070200@canonical.com> <20100428170721.GA6608@core.coreip.homeip.net> <4BD897D4.4060405@canonical.com> <1272560268.3987.12.camel@lovely> <4BDB5BA0.1080104@canonical.com> <1272769662.3315.36.camel@lovely> <4BE45474.8040001@canonical.com> Date: Sat, 08 May 2010 18:01:27 +0200 Message-Id: <1273334487.7427.3.camel@lovely> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 08 May 2010 15:55:27 +0000 (UTC) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 026df60..6750dbb 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -138,7 +138,9 @@ static int synaptics_capability(struct psmouse *psmouse) return -1; priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2]; priv->ext_cap = 0; - if (!SYN_CAP_VALID(priv->capabilities)) + if (!SYN_CAP_VALID(priv->capabilities) && + SYN_ID_MAJOR(priv->identity) < 7 && + SYN_ID_MINOR(priv->identity) < 5) return -1; /*