All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
	Oliver Neukum <oliver@neukum.org>
Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org,
	Johan Hovold <johan@kernel.org>
Subject: [PATCH net-next 1/2] net: kalmia: clean up bind error path
Date: Wed,  7 Mar 2018 10:46:57 +0100	[thread overview]
Message-ID: <20180307094658.9008-1-johan@kernel.org> (raw)

Drop bogus call to usb_driver_release_interface() from an error path in
the usbnet bind() callback, which is called during interface probe. At
this point the interface is not bound and usb_driver_release_interface()
returns early.

Also remove the bogus call to clear the interface data, which is owned
by the usbnet driver and would not even have been set by the time bind()
is called.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/net/usb/kalmia.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 1ec523b0e932..bd2ba3659028 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -150,12 +150,8 @@ kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
 	dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing
 
 	status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr);
-
-	if (status) {
-		usb_set_intfdata(intf, NULL);
-		usb_driver_release_interface(driver_of(intf), intf);
+	if (status)
 		return status;
-	}
 
 	memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);
 
-- 
2.16.2

WARNING: multiple messages have this Message-ID (diff)
From: Johan Hovold <johan@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
	Oliver Neukum <oliver@neukum.org>
Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org,
	Johan Hovold <johan@kernel.org>
Subject: [net-next,1/2] net: kalmia: clean up bind error path
Date: Wed,  7 Mar 2018 10:46:57 +0100	[thread overview]
Message-ID: <20180307094658.9008-1-johan@kernel.org> (raw)

Drop bogus call to usb_driver_release_interface() from an error path in
the usbnet bind() callback, which is called during interface probe. At
this point the interface is not bound and usb_driver_release_interface()
returns early.

Also remove the bogus call to clear the interface data, which is owned
by the usbnet driver and would not even have been set by the time bind()
is called.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/net/usb/kalmia.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 1ec523b0e932..bd2ba3659028 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -150,12 +150,8 @@ kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
 	dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing
 
 	status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr);
-
-	if (status) {
-		usb_set_intfdata(intf, NULL);
-		usb_driver_release_interface(driver_of(intf), intf);
+	if (status)
 		return status;
-	}
 
 	memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);
 

             reply	other threads:[~2018-03-07  9:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-07  9:46 Johan Hovold [this message]
2018-03-07  9:46 ` [net-next,1/2] net: kalmia: clean up bind error path Johan Hovold
2018-03-07  9:46 ` [PATCH net-next 2/2] net: cdc_eem: " Johan Hovold
2018-03-07  9:46   ` [net-next,2/2] " Johan Hovold
2018-03-07 10:30   ` [PATCH net-next 2/2] " Oliver Neukum
2018-03-07 10:30     ` [net-next,2/2] " Oliver Neukum
2018-03-07 14:56   ` [PATCH net-next 2/2] " Greg KH
2018-03-07 14:56     ` [net-next,2/2] " Greg KH
2018-03-07 20:39   ` [PATCH net-next 2/2] " David Miller
2018-03-07 20:39     ` [net-next,2/2] " David Miller
2018-03-07 14:56 ` [PATCH net-next 1/2] net: kalmia: " Greg KH
2018-03-07 14:56   ` [net-next,1/2] " Greg Kroah-Hartman
2018-03-07 20:39 ` [PATCH net-next 1/2] " David Miller
2018-03-07 20:39   ` [net-next,1/2] " 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=20180307094658.9008-1-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oliver@neukum.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.