Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61bf9f38 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

catc: Combine failure cleanup code in catc_probe() 



[ Upstream commit d41149145f98fe26dcd0bfd1d6cc095e6e041418 ]

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e898f6f0

drivers/net/usb/catc.c

+17 −16
Original line number Diff line number Diff line
@@ -777,7 +777,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)) {
@@ -812,12 +812,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 */
@@ -914,16 +910,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) {

	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 -EIO;

	}

	return 0;

	return ret;

}



static void catc_disconnect(struct usb_interface *intf)