瀏覽代碼

[PATCH] JMB 368 PATA detection

The Jmicron JMB368 is PATA only so has the PATA on function zero.  Don't
therefore skip function zero on this device when probing

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Cox 18 年之前
父節點
當前提交
c333526f48
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/ide/pci/generic.c

+ 4 - 2
drivers/ide/pci/generic.c

@@ -247,8 +247,10 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
 	    (!(PCI_FUNC(dev->devfn) & 1)))
 	    (!(PCI_FUNC(dev->devfn) & 1)))
 		goto out;
 		goto out;
 
 
-	if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
-		goto out;
+	if (dev->vendor == PCI_VENDOR_ID_JMICRON) {
+		if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1)
+			goto out;
+	}
 
 
 	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
 	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
 		pci_read_config_word(dev, PCI_COMMAND, &command);
 		pci_read_config_word(dev, PCI_COMMAND, &command);