diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-06-18 08:33:58 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-06-19 02:56:10 -0400 |
commit | 4afe2156eb639e563d6ef0c2706b66ea400348b2 (patch) | |
tree | b77e8cdc610ac1819fa9fb01591dfe3223263496 | |
parent | 33be081a812098567898bbe23b581460331a986f (diff) |
can: usb_8dev: unregister netdev before free()ing
The usb_8dev hardware has problems on some xhci USB hosts. The driver fails to
read the firmware revision in the probe function. This leads to the following
Oops:
[ 3356.635912] kernel BUG at net/core/dev.c:5701!
The driver tries to free the netdev, which has already been registered, without
unregistering it.
This patch fixes the problem by unregistering the netdev in the error path.
Reported-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Bernd Krumboeck <krumboeck@universalnet.at>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/usb/usb_8dev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index 6e15ef08f301..cbd388eea682 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c | |||
@@ -977,7 +977,7 @@ static int usb_8dev_probe(struct usb_interface *intf, | |||
977 | err = usb_8dev_cmd_version(priv, &version); | 977 | err = usb_8dev_cmd_version(priv, &version); |
978 | if (err) { | 978 | if (err) { |
979 | netdev_err(netdev, "can't get firmware version\n"); | 979 | netdev_err(netdev, "can't get firmware version\n"); |
980 | goto cleanup_cmd_msg_buffer; | 980 | goto cleanup_unregister_candev; |
981 | } else { | 981 | } else { |
982 | netdev_info(netdev, | 982 | netdev_info(netdev, |
983 | "firmware: %d.%d, hardware: %d.%d\n", | 983 | "firmware: %d.%d, hardware: %d.%d\n", |
@@ -989,6 +989,9 @@ static int usb_8dev_probe(struct usb_interface *intf, | |||
989 | 989 | ||
990 | return 0; | 990 | return 0; |
991 | 991 | ||
992 | cleanup_unregister_candev: | ||
993 | unregister_netdev(priv->netdev); | ||
994 | |||
992 | cleanup_cmd_msg_buffer: | 995 | cleanup_cmd_msg_buffer: |
993 | kfree(priv->cmd_msg_buffer); | 996 | kfree(priv->cmd_msg_buffer); |
994 | 997 | ||