diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 07:47:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 07:47:03 -0700 |
commit | 1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf (patch) | |
tree | 74f7837b131703a10e4e8a2143339c5aa0bf47d2 /drivers/firewire/net.c | |
parent | 1605abfffe331b3d9f845a456e7762f1bf53d973 (diff) | |
parent | d151f9854f21fbb6a2df73553a27f9b664ecd10c (diff) | |
download | linux-stable-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.tar.gz linux-stable-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.tar.bz2 linux-stable-1b3636093d4e07f5fc8a8eb2f9a5e14a5a2674bf.zip |
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()
Diffstat (limited to 'drivers/firewire/net.c')
-rw-r--r-- | drivers/firewire/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 4af0a7bad7f2..c3986452194d 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -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; |