Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / media / usb / cpia2 / cpia2_usb.c

diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c
index 3ab80a7b44985d7b694a99accdad6fc374f2a9ae..76aac06f9fb8e2cb5b85ada5a77be10900e37dfc 100644 (file)
--- a/drivers/media/usb/cpia2/cpia2_usb.c
+++ b/drivers/media/usb/cpia2/cpia2_usb.c
@@ -844,15 +844,13 @@ static int cpia2_usb_probe(struct usb_interface *intf,
        ret = set_alternate(cam, USBIF_CMDONLY);
        if (ret < 0) {
                ERR("%s: usb_set_interface error (ret = %d)\n", __func__, ret);
-               kfree(cam);
-               return ret;
+               goto alt_err;
        }
 
 
        if((ret = cpia2_init_camera(cam)) < 0) {
                ERR("%s: failed to initialize cpia2 camera (ret = %d)\n", __func__, ret);
-               kfree(cam);
-               return ret;
+               goto alt_err;
        }
        LOG("  CPiA Version: %d.%02d (%d.%d)\n",
               cam->params.version.firmware_revision_hi,
@@ -872,11 +870,14 @@ static int cpia2_usb_probe(struct usb_interface *intf,
        ret = cpia2_register_camera(cam);
        if (ret < 0) {
                ERR("%s: Failed to register cpia2 camera (ret = %d)\n", __func__, ret);
-               kfree(cam);
-               return ret;
+               goto alt_err;
        }
 
        return 0;
+
+alt_err:
+       cpia2_deinit_camera_struct(cam, intf);
+       return ret;
 }
 
 /******************************************************************************