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

Commit a49cd5f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
  firewire: ohci: fix regression with VIA VT6315, disable MSI
parents 353495a5 9993e0fe

drivers/firewire/ohci.c

+33 −14
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card) 


static char ohci_driver_name[] = KBUILD_MODNAME;



#define PCI_DEVICE_ID_AGERE_FW643	0x5901

#define PCI_DEVICE_ID_JMICRON_JMB38X_FW	0x2380

#define PCI_DEVICE_ID_TI_TSB12LV22	0x8009
@@ -253,18 +254,34 @@ static char ohci_driver_name[] = KBUILD_MODNAME; 


/* In case of multiple matches in ohci_quirks[], only the first one is used. */

static const struct {

	unsigned short vendor, device, flags;

	unsigned short vendor, device, revision, flags;

} ohci_quirks[] = {

	{PCI_VENDOR_ID_TI,	PCI_DEVICE_ID_TI_TSB12LV22, QUIRK_CYCLE_TIMER |

							    QUIRK_RESET_PACKET |

							    QUIRK_NO_1394A},

	{PCI_VENDOR_ID_TI,	PCI_ANY_ID,	QUIRK_RESET_PACKET},

	{PCI_VENDOR_ID_AL,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_JMICRON,	PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI},

	{PCI_VENDOR_ID_NEC,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_VIA,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_RICOH,	PCI_ANY_ID,	QUIRK_CYCLE_TIMER},

	{PCI_VENDOR_ID_APPLE,	PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS},

	{PCI_VENDOR_ID_AL, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER},



	{PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_FW, PCI_ANY_ID,

		QUIRK_BE_HEADERS},



	{PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,

		QUIRK_NO_MSI},



	{PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,

		QUIRK_NO_MSI},



	{PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER},



	{PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER},



	{PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},



	{PCI_VENDOR_ID_TI, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_RESET_PACKET},



	{PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},

};



/* This overrides anything that was found in ohci_quirks[]. */
@@ -2927,9 +2944,11 @@ static int __devinit pci_probe(struct pci_dev *dev, 
	}



	for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)

		if (ohci_quirks[i].vendor == dev->vendor &&

		    (ohci_quirks[i].device == dev->device ||

		     ohci_quirks[i].device == (unsigned short)PCI_ANY_ID)) {

		if ((ohci_quirks[i].vendor == dev->vendor) &&

		    (ohci_quirks[i].device == (unsigned short)PCI_ANY_ID ||

		     ohci_quirks[i].device == dev->device) &&

		    (ohci_quirks[i].revision == (unsigned short)PCI_ANY_ID ||

		     ohci_quirks[i].revision >= dev->revision)) {

			ohci->quirks = ohci_quirks[i].flags;

			break;

		}