diff options
Diffstat (limited to 'drivers/ide/pci/generic.c')
-rw-r--r-- | drivers/ide/pci/generic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index ad418ce882ca..9f306880491a 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
@@ -48,7 +48,7 @@ static int ide_generic_all; /* Set to claim all devices */ | |||
48 | static int __init ide_generic_all_on(char *unused) | 48 | static int __init ide_generic_all_on(char *unused) |
49 | { | 49 | { |
50 | ide_generic_all = 1; | 50 | ide_generic_all = 1; |
51 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers."); | 51 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n"); |
52 | return 1; | 52 | return 1; |
53 | } | 53 | } |
54 | __setup("all-generic-ide", ide_generic_all_on); | 54 | __setup("all-generic-ide", ide_generic_all_on); |
@@ -247,8 +247,10 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi | |||
247 | (!(PCI_FUNC(dev->devfn) & 1))) | 247 | (!(PCI_FUNC(dev->devfn) & 1))) |
248 | goto out; | 248 | goto out; |
249 | 249 | ||
250 | if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1) | 250 | if (dev->vendor == PCI_VENDOR_ID_JMICRON) { |
251 | goto out; | 251 | if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1) |
252 | goto out; | ||
253 | } | ||
252 | 254 | ||
253 | if (dev->vendor != PCI_VENDOR_ID_JMICRON) { | 255 | if (dev->vendor != PCI_VENDOR_ID_JMICRON) { |
254 | pci_read_config_word(dev, PCI_COMMAND, &command); | 256 | pci_read_config_word(dev, PCI_COMMAND, &command); |