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

Commit 1b363609 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-updates' of... 

Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 into next

Pull firewire updates from Stefan Richter:
 "IEEE 1394 (FireWire) subsystem changes: One optimization for some VIA
  controllers, one fix, one kconfig brushup"

* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk
  firewire: Use COMPILE_TEST for build testing
  firewire: net: fix NULL derefencing in fwnet_probe()
parents 1605abff d151f985

drivers/firewire/Kconfig

+1 −1
Original line number Diff line number Diff line 
menu "IEEE 1394 (FireWire) support"

	depends on PCI || BROKEN

	depends on PCI || COMPILE_TEST

	# firewire-core does not depend on PCI but is

	# not useful without PCI controller driver

drivers/firewire/net.c

+2 −2
Original line number Diff line number Diff line
@@ -1462,8 +1462,8 @@ static int fwnet_probe(struct fw_unit *unit, 


	net = alloc_netdev(sizeof(*dev), "firewire%d", fwnet_init_dev);

	if (net == NULL) {

		ret = -ENOMEM;

		goto out;

		mutex_unlock(&fwnet_device_mutex);

		return -ENOMEM;

	}



	allocated_netdev = true;

drivers/firewire/ohci.c

+7 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static char ohci_driver_name[] = KBUILD_MODNAME; 
#define PCI_DEVICE_ID_TI_TSB82AA2	0x8025

#define PCI_DEVICE_ID_VIA_VT630X	0x3044

#define PCI_REV_ID_VIA_VT6306		0x46

#define PCI_DEVICE_ID_VIA_VT6315	0x3403



#define QUIRK_CYCLE_TIMER		0x1

#define QUIRK_RESET_PACKET		0x2
@@ -334,6 +335,12 @@ static const struct { 
	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT630X, PCI_REV_ID_VIA_VT6306,

		QUIRK_CYCLE_TIMER | QUIRK_IR_WAKE},



	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, 0,

		QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},



	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, PCI_ANY_ID,

		0},



	{PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,

		QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},

};