Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c333526f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[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: default avatarAlan Cox <alan@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8fa1d7d3

drivers/ide/pci/generic.c

+4 −2
Original line number Diff line number Diff line
@@ -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)

	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);