From: Ben Hutchings <ben-/+tVBieCtBitmTQ+vhA3Yw@public•gmane.org>
To: netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: [PATCH net 3/4] catc: Combine failure cleanup code in catc_probe()
Date: Sat, 4 Feb 2017 16:56:56 +0000 [thread overview]
Message-ID: <20170204165656.GX3442@decadent.org.uk> (raw)
In-Reply-To: <20170204165451.GU3442-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]
Signed-off-by: Ben Hutchings <ben-/+tVBieCtBitmTQ+vhA3Yw@public•gmane.org>
---
drivers/net/usb/catc.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 3daa41bdd4ea..985909eab72c 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -776,7 +776,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
struct net_device *netdev;
struct catc *catc;
u8 broadcast[ETH_ALEN];
- int i, pktsz;
+ int i, pktsz, ret;
if (usb_set_interface(usbdev,
intf->altsetting->desc.bInterfaceNumber, 1)) {
@@ -811,12 +811,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
(!catc->rx_urb) || (!catc->irq_urb)) {
dev_err(&intf->dev, "No free urbs available.\n");
- usb_free_urb(catc->ctrl_urb);
- usb_free_urb(catc->tx_urb);
- usb_free_urb(catc->rx_urb);
- usb_free_urb(catc->irq_urb);
- free_netdev(netdev);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto fail_free;
}
/* The F5U011 has the same vendor/product as the netmate but a device version of 0x130 */
@@ -913,16 +909,21 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
usb_set_intfdata(intf, catc);
SET_NETDEV_DEV(netdev, &intf->dev);
- if (register_netdev(netdev) != 0) {
- usb_set_intfdata(intf, NULL);
- usb_free_urb(catc->ctrl_urb);
- usb_free_urb(catc->tx_urb);
- usb_free_urb(catc->rx_urb);
- usb_free_urb(catc->irq_urb);
- free_netdev(netdev);
- return -EIO;
- }
+ ret = register_netdev(netdev);
+ if (ret)
+ goto fail_clear_intfdata;
+
return 0;
+
+fail_clear_intfdata:
+ usb_set_intfdata(intf, NULL);
+fail_free:
+ usb_free_urb(catc->ctrl_urb);
+ usb_free_urb(catc->tx_urb);
+ usb_free_urb(catc->rx_urb);
+ usb_free_urb(catc->irq_urb);
+ free_netdev(netdev);
+ return ret;
}
static void catc_disconnect(struct usb_interface *intf)
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2017-02-04 16:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-04 16:54 [PATCH net 0/4] Fix on-stack USB buffers Ben Hutchings
2017-02-04 16:56 ` [PATCH net 1/4] pegasus: Use heap buffers for all register access Ben Hutchings
2017-02-05 0:30 ` Greg KH
2017-02-06 8:14 ` Petko Manolov
2017-02-06 8:28 ` Greg KH
2017-02-06 12:51 ` Petko Manolov
2017-02-06 13:21 ` Johan Hovold
2017-02-06 13:32 ` Johan Hovold
2017-02-06 13:46 ` Johan Hovold
2017-02-07 10:24 ` Petko Manolov
2017-02-07 10:45 ` Greg KH
[not found] ` <20170207104506.GB32583-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2017-02-07 12:50 ` Petko Manolov
2017-02-06 13:30 ` David Laight
2017-02-07 18:32 ` Steve Calfee
2017-02-08 7:57 ` Petko Manolov
2017-02-04 16:56 ` [PATCH net 2/4] rtl8150: " Ben Hutchings
2017-02-06 8:10 ` Petko Manolov
[not found] ` <20170204165631.GW3442-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
2017-02-06 16:09 ` David Laight
2017-02-06 16:25 ` Ben Hutchings
2017-02-07 10:34 ` Petko Manolov
2017-02-07 10:51 ` Greg KH
2017-02-07 11:56 ` David Laight
[not found] ` <063D6719AE5E284EB5DD2968C1650D6DB027DB75-VkEWCZq2GCInGFn1LkZF6NBPR1lH4CV8@public.gmane.org>
2017-02-07 12:42 ` 'Greg KH'
2017-02-07 12:53 ` Petko Manolov
2017-02-07 13:01 ` Greg KH
2017-02-07 13:20 ` Petko Manolov
2017-02-07 14:14 ` David Laight
2017-02-07 14:52 ` Petko Manolov
[not found] ` <20170204165451.GU3442-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
2017-02-04 16:56 ` Ben Hutchings [this message]
2017-02-04 16:57 ` [PATCH net 4/4] catc: Use heap buffer for memory size test Ben Hutchings
2017-02-07 15:07 ` [PATCH net 0/4] Fix on-stack USB buffers David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170204165656.GX3442@decadent.org.uk \
--to=ben-/+tvbiectbitmtq+vha3yw@public$(echo .)gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox