Skip to content

Commit

Permalink
can: vxcan: Use common error handling code in vxcan_newlink()
Browse files Browse the repository at this point in the history
Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Markus Elfring authored and Marc Kleine-Budde committed Dec 1, 2017
1 parent aa4f3c6 commit 48794a8
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/net/can/vxcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
netif_carrier_off(peer);

err = rtnl_configure_link(peer, ifmp);
if (err < 0) {
unregister_netdevice(peer);
return err;
}
if (err < 0)
goto unregister_network_device;

/* register first device */
if (tb[IFLA_IFNAME])
Expand All @@ -239,10 +237,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");

err = register_netdevice(dev);
if (err < 0) {
unregister_netdevice(peer);
return err;
}
if (err < 0)
goto unregister_network_device;

netif_carrier_off(dev);

Expand All @@ -254,6 +250,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
rcu_assign_pointer(priv->peer, dev);

return 0;

unregister_network_device:
unregister_netdevice(peer);
return err;
}

static void vxcan_dellink(struct net_device *dev, struct list_head *head)
Expand Down

0 comments on commit 48794a8

Please sign in to comment.