drivers: usb: smsusb: fix error handling code in smsusb_init_device

The previous commit 4b208f8b561f ("[media] siano: register media controller
earlier")moves siano_media_device_register before smscore_register_device,
and adds corresponding error handling code if smscore_register_device
fails. However, it misses the following error handling code of
smsusb_init_device.

Fix this by moving error handling code at the end of smsusb_init_device
and adding a goto statement in the following error handling parts.

Fixes: 4b208f8b561f ("[media] siano: register media controller earlier")
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 640737d3b8aeb266dfc0db514cac9b3c3a85a419..8a39cac76c5850edbfbfedf859e8084cdaf39cd5 100644 (file)
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -455,12 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        rc = smscore_register_device(&params, &dev->coredev, 0, mdev);
        if (rc < 0) {
                pr_err("smscore_register_device(...) failed, rc %d\n", rc);
-               smsusb_term_device(intf);
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
-               media_device_unregister(mdev);
-#endif
-               kfree(mdev);
-               return rc;
+               goto err_unregister_device;
        }
 
        smscore_set_board_id(dev->coredev, board_id);
@@ -477,8 +472,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        rc = smsusb_start_streaming(dev);
        if (rc < 0) {
                pr_err("smsusb_start_streaming(...) failed\n");
-               smsusb_term_device(intf);
-               return rc;
+               goto err_unregister_device;
        }
 
        dev->state = SMSUSB_ACTIVE;
@@ -486,13 +480,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
        rc = smscore_start_device(dev->coredev);
        if (rc < 0) {
                pr_err("smscore_start_device(...) failed\n");
-               smsusb_term_device(intf);
-               return rc;
+               goto err_unregister_device;
        }
 
        pr_debug("device 0x%p created\n", dev);
 
        return rc;
+
+err_unregister_device:
+       smsusb_term_device(intf);
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+       media_device_unregister(mdev);
+#endif
+       kfree(mdev);
+       return rc;
 }
 
 static int smsusb_probe(struct usb_interface *intf,