Patch "catc: Combine failure cleanup code in catc_probe()" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
catc: Combine failure cleanup code in catc_probe()
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
catc-combine-failure-cleanup-code-in-catc_probe.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Feb 14 17:03:08 PST 2017
From: Ben Hutchings <[email protected]>
Date: Sat, 4 Feb 2017 16:56:56 +0000
Subject: catc: Combine failure cleanup code in catc_probe()
From: Ben Hutchings <[email protected]>
[ Upstream commit d41149145f98fe26dcd0bfd1d6cc095e6e041418 ]
--- drivers/net/usb/catc.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/net/usb/catc.c +17 -16
@@ -777,7 +777,7 @@ static int catc_probe(struct usb_interfastruct 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 )) {
@@ -812,12 +812,8 @@ static int catc_probe(struct usb_interfaif ((!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 */
@@ -914,16 +910,21 @@ static int catc_probe(struct usb_interfausb_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)
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/catc-combine-failure-cleanup-code-in-catc_probe.patch queue-4.9/catc-use-heap-buffer-for-memory-size-test.patch queue-4.9/pegasus-use-heap-buffers-for-all-register-access.patch queue-4.9/rtl8150-use-heap-buffers-for-all-register-access.patch