summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDave Jones2008-07-16 01:54:53 +0200
committerJeff Garzik2008-07-22 23:59:26 +0200
commit152151daece9d5dfd86e652b95846072c0d2b566 (patch)
treead6135c9a8ce2b6fc3684cc271106b315f710fd5 /drivers/net
parent8139too: Make PIO/MMIO a runtime decision through a module parameter. (diff)
downloadkernel-qcow2-linux-152151daece9d5dfd86e652b95846072c0d2b566.tar.gz
kernel-qcow2-linux-152151daece9d5dfd86e652b95846072c0d2b566.tar.xz
kernel-qcow2-linux-152151daece9d5dfd86e652b95846072c0d2b566.zip
8139too: Force usage of PIO on OQO2
The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO. It fails on modprobe, with a 'PCI Bus error' message. Force it to always use polled IO. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/8139too.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index f172b5d822d7..f62ac64e98fe 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -949,6 +949,14 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
"Use the \"8139cp\" driver for improved performance and stability.\n");
}
+ if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
+ pdev->device == PCI_DEVICE_ID_REALTEK_8139 &&
+ pdev->subsystem_vendor == PCI_VENDOR_ID_ATHEROS &&
+ pdev->subsystem_device == PCI_DEVICE_ID_REALTEK_8139) {
+ printk(KERN_INFO "8139too: OQO Model 2 detected. Forcing PIO\n");
+ use_io = 1;
+ }
+
i = rtl8139_init_board (pdev, &dev);
if (i < 0)
return i;