github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: stk1160: cleanup error handling in probe

Browse Source 
Do not replicate cleanup code.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Oliver Neukum 2026-07-09 15:21:23 +02:00 committed by Hans Verkuil
parent 3a7d6b9c4c
commit 083362373e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/usb/stk1160/stk1160-core.c
View File

@ -263,7 +263,7 @@ static int stk1160_scan_usb(struct usb_interface *intf, struct usb_device *udev,
static int stk1160_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
int rc = 0;
int rc;
unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
struct usb_device *udev;
@ -290,15 +290,13 @@ static int stk1160_probe(struct usb_interface *interface,
* Also, check if device speed is fast enough.
*/
rc = stk1160_scan_usb(interface, udev, alt_max_pkt_size);
if (rc < 0) {
kfree(alt_max_pkt_size);
return rc;
}
if (rc < 0)
goto free_array;
dev = kzalloc_obj(struct stk1160);
if (dev == NULL) {
kfree(alt_max_pkt_size);
return -ENOMEM;
rc = -ENOMEM;
goto free_array;
}
dev->alt_max_pkt_size = alt_max_pkt_size;
@ -379,8 +377,9 @@ static int stk1160_probe(struct usb_interface *interface,
free_ctrl:
v4l2_ctrl_handler_free(&dev->ctrl_handler);
free_err:
kfree(alt_max_pkt_size);
kfree(dev);
free_array:
kfree(alt_max_pkt_size);
return rc;
}