From 4228432859eae7cc458e4fc447690b6506f60dc0 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 28 Oct 2006 10:38:57 -0700 Subject: [PATCH] --- yaml --- r: 40419 b: refs/heads/master c: c333526f489044be2b93085720eb898f0037b346 h: refs/heads/master i: 40417: 30e893a5c826ab5cca87f40b551aa1284b010e6f 40415: e52ecc31bf8dee4ceead09e2261915822bf8533d v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/generic.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63428ab6e887..cecddabbc562 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fa1d7d3b2c51594c0f3aa151983dd51f605e07d +refs/heads/master: c333526f489044be2b93085720eb898f0037b346 diff --git a/trunk/drivers/ide/pci/generic.c b/trunk/drivers/ide/pci/generic.c index ad418ce882ca..e72ab36a5494 100644 --- a/trunk/drivers/ide/pci/generic.c +++ b/trunk/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))) 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) { pci_read_config_word(dev, PCI_COMMAND, &command);