cpia2: unregister device on probe error
PATCH 1/1 cpia2: unregister device on probe error
The v4l2 device must be unregistered in case probe() fails, lest we get a leak.
Reported-and-tested-by [email protected]
Signed-off-by Oliver Neukum <[email protected]>
--- drivers/media/usb/cpia2/cpia2_usb.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/media/usb/cpia2/cpia2_usb.c +7 -6
@@ -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 error; }if ((ret =cpia2_init_camera (cam)) <0 ) {ERR ("%s: failed to initialize cpia2 camera (ret = %d)\n" , __func__, ret); -kfree (cam); -return ret; + goto error; } 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 error; }return 0 ; +error: +v4l2_device_unregister (&cam->v4l2_dev); +kfree (cam); +return ret; }/******************************************************************************
Signature · 1 line
2.26.2