From 5104a03d7d0ef4b0222155f2fa6902bf727b1005 Mon Sep 17 00:00:00 2001 From: YOSHIFUJI Hideaki Date: Fri, 8 Mar 2013 10:42:07 +0900 Subject: [PATCH] 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 Signed-off-by: Stefan Richter --- drivers/firewire/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.39.5