From patchwork Thu Dec 31 12:19:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Kluin X-Patchwork-Id: 70365 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBVCGYL3021351 for ; Thu, 31 Dec 2009 12:16:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751568AbZLaMQc (ORCPT ); Thu, 31 Dec 2009 07:16:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751719AbZLaMQc (ORCPT ); Thu, 31 Dec 2009 07:16:32 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:1078 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbZLaMQb (ORCPT ); Thu, 31 Dec 2009 07:16:31 -0500 Received: by ey-out-2122.google.com with SMTP id 25so1926382eya.19 for ; Thu, 31 Dec 2009 04:16:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=1aOT9C3p3H6yv5zKf6wN9BFgYJWVGOAtnu42TUR/FSk=; b=jcRH2VmcxQ0SEqKOP3fWPUSaGAo8EUgc70Kr/+9sLuwdG7zwmOd+HWfdQtN0S/oLX3 C1E00yUmXc8w6dOZmCU5ARWdCw9mhhTaA6rXwU6WkPvdJKhg5afYdS9rwHpkDKuayQ1O n23XtVlmZznaOPFvJ1wyBrT+wBKNejuhSlJUc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=xiXCcoQajsKi2jBvLEBEdRH5hbdv/ryuOvMQQDvNCccl9wU1iwy7iSIomvVJhxA9zQ cUVXGcf+oE9bzZnXSXdoLWrazgIqgnbNguqCa8JfBkNsxzqSaG1TkMGPytbu7RROXdhc qyrxlbko6zuGxBa93x5Yauqsvh7kS+7syVqDc= Received: by 10.213.110.17 with SMTP id l17mr14072560ebp.91.1262261789764; Thu, 31 Dec 2009 04:16:29 -0800 (PST) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 23sm29870885eya.35.2009.12.31.04.16.29 (version=SSLv3 cipher=RC4-MD5); Thu, 31 Dec 2009 04:16:29 -0800 (PST) Message-ID: <4B3C96DF.8060903@gmail.com> Date: Thu, 31 Dec 2009 13:19:43 +0100 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Thunderbird/3.0 MIME-Version: 1.0 To: Dmitry Torokhov , Dmitry Torokhov , linux-input@vger.kernel.org, Andrew Morton , LKML Subject: [PATCH] Input: &&/|| confusion in gf2k_connect()? Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c index 67c207f..45ac70e 100644 --- a/drivers/input/joystick/gf2k.c +++ b/drivers/input/joystick/gf2k.c @@ -277,7 +277,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv) } #ifdef RESET_WORKS - if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) || + if ((gf2k->id != (GB(19,2,0) | GB(15,3,2) | GB(12,3,5))) && (gf2k->id != (GB(31,2,0) | GB(27,3,2) | GB(24,3,5)))) { err = -ENODEV; goto fail2;