diff mbox

PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio

Message ID 20110415102407.7fd21215@endymion.delvare (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Jean Delvare April 15, 2011, 8:24 a.m. UTC 
From: Jean Delvare <khali@linux-fr.org>
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 <khali@linux-fr.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/pci/quirks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jesse Barnes April 15, 2011, 4:06 p.m. UTC | #1 
On Fri, 15 Apr 2011 10:24:07 +0200
Jean Delvare <khali@linux-fr.org> wrote:

> From: Jean Delvare <khali@linux-fr.org>
> 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 <khali@linux-fr.org>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---

Applied both of these to linux-next, thanks.
diff mbox

Patch

--- 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, &region);
 		region &= PCI_BASE_ADDRESS_IO_MASK;
 		if (region >= PCIBIOS_MIN_IO)