media: stk1160: cleanup error handling in probe
Subsystems (2)
PATCH 1/2 media: stk1160: cleanup error handling in probe
Do not replicate cleanup code.
Signed-off-by Oliver Neukum <[email protected]>
--- drivers/media/usb/stk1160/stk1160-core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/media/usb/stk1160/stk1160-core.c +7 -8
@@ -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; }
Signature · 1 line
2.54.0
PATCH 2/2 media: stk1160: handle ESHUTDOWN gracefully
Give it its own error message.
Signed-off-by Oliver Neukum <[email protected]>
--- drivers/media/usb/stk1160/stk1160-video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/usb/stk1160/stk1160-video.c +3 -0
@@ -48,6 +48,9 @@ static inline void print_err_status(struct stk1160 *dev,case -EILSEQ : errmsg ="CRC/Timeout (could be anything)" ;break ; +case -ESHUTDOWN : + errmsg ="host controller removed" ; +break ;case -ETIME : errmsg ="Device does not respond" ;break ;
Signature · 1 line
2.54.0