can: peak_usb: fix cleanup sequence order in case of error during init

commit af35d0f1cce7a990286e2b94c260a2c2d2a0e4b0 upstream.

This patch sets the correct reverse sequence order to the instructions
set to run, when any failure occurs during the initialization steps.
It also adds the missing unregistration call of the can device if the
failure appears after having been registered.

Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Zefan Li <lizefan@huawei.com>

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index d2f91f737871889e59f83b227abed4751f04c171..925c7e16a1c0aad6fa6e92df3c0f11574f4068f2 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -737,7 +737,7 @@ static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
                dev_err(&intf->dev, "%s: couldn't alloc cmd buffer\n",
                        PCAN_USB_DRIVER_NAME);
                err = -ENOMEM;
-               goto lbl_set_intf_data;
+               goto lbl_free_candev;
        }
 
        dev->udev = usb_dev;
@@ -776,7 +776,7 @@ static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
        err = register_candev(netdev);
        if (err) {
                dev_err(&intf->dev, "couldn't register CAN device: %d\n", err);
-               goto lbl_free_cmd_buf;
+               goto lbl_restore_intf_data;
        }
 
        if (dev->prev_siblings)
@@ -789,14 +789,14 @@ static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
        if (dev->adapter->dev_init) {
                err = dev->adapter->dev_init(dev);
                if (err)
-                       goto lbl_free_cmd_buf;
+                       goto lbl_unregister_candev;
        }
 
        /* set bus off */
        if (dev->adapter->dev_set_bus) {
                err = dev->adapter->dev_set_bus(dev, 0);
                if (err)
-                       goto lbl_free_cmd_buf;
+                       goto lbl_unregister_candev;
        }
 
        /* get device number early */
@@ -808,11 +808,14 @@ static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
 
        return 0;
 
-lbl_free_cmd_buf:
-       kfree(dev->cmd_buf);
+lbl_unregister_candev:
+       unregister_candev(netdev);
 
-lbl_set_intf_data:
+lbl_restore_intf_data:
        usb_set_intfdata(intf, dev->prev_siblings);
+       kfree(dev->cmd_buf);
+
+lbl_free_candev:
        free_candev(netdev);
 
        return err;