On Thu Jul 9 15:21:23 2026 +0200, Oliver Neukum wrote:
> Do not replicate cleanup code.
>
> Signed-off-by: Oliver Neukum <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/usb/stk1160/stk1160-core.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/usb/stk1160/stk1160-core.c
b/drivers/media/usb/stk1160/stk1160-core.c
index f9462a9ca761..5058cada0d0a 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -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 @@ unreg_v4l2:
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;
}
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
