From patchwork Fri Apr 15 08:24:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 710381 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3F8OJvx023556 for ; Fri, 15 Apr 2011 08:24:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751076Ab1DOIYQ (ORCPT ); Fri, 15 Apr 2011 04:24:16 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:37347 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750973Ab1DOIYO (ORCPT ); Fri, 15 Apr 2011 04:24:14 -0400 Received: from jdelvare.pck.nerim.net ([62.212.121.182] helo=endymion.delvare) by services.gcu-squad.org (GCU Mailer Daemon) with esmtpsa id 1QAfRR-0006D8-DI (TLSv1:AES128-SHA:128) (envelope-from ) ; Fri, 15 Apr 2011 11:35:53 +0200 Date: Fri, 15 Apr 2011 10:24:07 +0200 From: Jean Delvare To: Jesse Barnes Cc: linux-pci@vger.kernel.org Subject: [PATCH] PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio Message-ID: <20110415102407.7fd21215@endymion.delvare> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 15 Apr 2011 08:24:41 +0000 (UTC) From: Jean Delvare Subject: PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio We were just lucky that ICH4_GPIO_EN and ICH6_GPIO_EN happen to have the same value. Signed-off-by: Jean Delvare Cc: Jesse Barnes --- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.39-rc3.orig/drivers/pci/quirks.c 2011-04-15 09:50:18.000000000 +0200 +++ linux-2.6.39-rc3/drivers/pci/quirks.c 2011-04-15 10:04:35.000000000 +0200 @@ -606,7 +606,7 @@ static void __devinit ich6_lpc_acpi_gpio } pci_read_config_byte(dev, ICH6_GPIO_CNTL, &enable); - if (enable & ICH4_GPIO_EN) { + if (enable & ICH6_GPIO_EN) { pci_read_config_dword(dev, ICH6_GPIOBASE, ®ion); region &= PCI_BASE_ADDRESS_IO_MASK; if (region >= PCIBIOS_MIN_IO)