summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2013-03-08 02:42:07 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2013-03-13 16:11:10 +0100
commit5104a03d7d0ef4b0222155f2fa6902bf727b1005 (patch)
tree6c97d07187481c9f991a5c7bde99705d71478d04
parentLinux 3.9-rc1 (diff)
downloadlinux-5104a03d7d0ef4b0222155f2fa6902bf727b1005.tar.xz
linux-5104a03d7d0ef4b0222155f2fa6902bf727b1005.zip
firewire net: No need to reset dev->local_fifo after failure of fw_core_add_address_handler().
fwnet_broadcast_start() try to register address handler at first if it was not registered yet; dev->local_fifo == FWNET_NO_FIFO_ADDR. Since dev->local_info not changed if fw_core_add_address_hander() has failed, we do not need to set dev->local_info to FWNET_NO_FIFO_ADDR. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/firewire/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2b27bff2591a..a7a0e8277147 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1220,8 +1220,8 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
dev->broadcast_rcv_context = NULL;
failed_context_create:
fw_core_remove_address_handler(&dev->handler);
- failed_initial:
dev->local_fifo = FWNET_NO_FIFO_ADDR;
+ failed_initial:
return retval;
}