From eebc65184e15f1da56c746b705d8b55594fee87b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 18 Jun 2013 14:33:58 +0200 Subject: [PATCH] --- yaml --- r: 377403 b: refs/heads/master c: 4afe2156eb639e563d6ef0c2706b66ea400348b2 h: refs/heads/master i: 377401: 1fd9cc4afa318e9212214ded9f58e6ddff0d522d 377399: 403f0da24764ec12b38d312a5a4619a80c6c24a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/usb/usb_8dev.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0346d1eedb0..fedbbd227201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33be081a812098567898bbe23b581460331a986f +refs/heads/master: 4afe2156eb639e563d6ef0c2706b66ea400348b2 diff --git a/trunk/drivers/net/can/usb/usb_8dev.c b/trunk/drivers/net/can/usb/usb_8dev.c index 6e15ef08f301..cbd388eea682 100644 --- a/trunk/drivers/net/can/usb/usb_8dev.c +++ b/trunk/drivers/net/can/usb/usb_8dev.c @@ -977,7 +977,7 @@ static int usb_8dev_probe(struct usb_interface *intf, err = usb_8dev_cmd_version(priv, &version); if (err) { netdev_err(netdev, "can't get firmware version\n"); - goto cleanup_cmd_msg_buffer; + goto cleanup_unregister_candev; } else { netdev_info(netdev, "firmware: %d.%d, hardware: %d.%d\n", @@ -989,6 +989,9 @@ static int usb_8dev_probe(struct usb_interface *intf, return 0; +cleanup_unregister_candev: + unregister_netdev(priv->netdev); + cleanup_cmd_msg_buffer: kfree(priv->cmd_msg_buffer);