From patchwork Mon May 17 21:19:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 100218 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 o4HLKVPx001652 for ; Mon, 17 May 2010 21:20:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982Ab0EQVUa (ORCPT ); Mon, 17 May 2010 17:20:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35037 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754440Ab0EQVU3 (ORCPT ); Mon, 17 May 2010 17:20:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4HLJrtm028972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 17 May 2010 17:19:53 -0400 Received: from cavan.codon.org.uk (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4HLJq43024409 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 17 May 2010 17:19:53 -0400 Received: from lan-nat-pool-bos.redhat.com ([66.187.234.200] helo=localhost.localdomain) by cavan.codon.org.uk with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OE7j2-0000YM-M1; Mon, 17 May 2010 22:19:48 +0100 From: Matthew Garrett To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, Matthew Garrett Subject: [PATCH V3] input: Default to only using PNP for i8042 probing on x86 Date: Mon, 17 May 2010 17:19:44 -0400 Message-Id: <1274131184-30931-1-git-send-email-mjg@redhat.com> In-Reply-To: References: X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 66.187.234.200 X-SA-Exim-Mail-From: mjg@redhat.com X-SA-Exim-Scanned: No (on cavan.codon.org.uk); SAEximRunCond expanded to false X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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]); Mon, 17 May 2010 21:20:31 +0000 (UTC) diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 6168469..19d11f3 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -1,6 +1,8 @@ #ifndef _I8042_X86IA64IO_H #define _I8042_X86IA64IO_H +#include + /* * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by @@ -744,12 +746,16 @@ static int __init i8042_pnp_init(void) if (!i8042_pnp_kbd_devices && !i8042_pnp_aux_devices) { i8042_pnp_exit(); -#if defined(__ia64__) - return -ENODEV; -#else + + /* Non-ACPI systems are much less likely to have the + * KBC declared via PNP, so if acpi is disabled fall + * back to banging the ports directly */ + + if (!acpi_disabled) + return -ENODEV; + printk(KERN_INFO "PNP: No PS/2 controller found. Probing ports directly.\n"); return 0; -#endif } if (i8042_pnp_kbd_devices)