From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f65.google.com ([209.85.215.65]:46015 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbeCGJrT (ORCPT ); Wed, 7 Mar 2018 04:47:19 -0500 From: Johan Hovold To: "David S. Miller" , Oliver Neukum Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, Johan Hovold Subject: [PATCH net-next 1/2] net: kalmia: clean up bind error path Date: Wed, 7 Mar 2018 10:46:57 +0100 Message-Id: <20180307094658.9008-1-johan@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [net-next,1/2] net: kalmia: clean up bind error path From: Johan Hovold Message-Id: <20180307094658.9008-1-johan@kernel.org> Date: Wed, 7 Mar 2018 10:46:57 +0100 To: "David S. Miller" , Oliver Neukum Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, Johan Hovold List-ID: RHJvcCBib2d1cyBjYWxsIHRvIHVzYl9kcml2ZXJfcmVsZWFzZV9pbnRlcmZhY2UoKSBmcm9tIGFu IGVycm9yIHBhdGggaW4KdGhlIHVzYm5ldCBiaW5kKCkgY2FsbGJhY2ssIHdoaWNoIGlzIGNhbGxl ZCBkdXJpbmcgaW50ZXJmYWNlIHByb2JlLiBBdAp0aGlzIHBvaW50IHRoZSBpbnRlcmZhY2UgaXMg bm90IGJvdW5kIGFuZCB1c2JfZHJpdmVyX3JlbGVhc2VfaW50ZXJmYWNlKCkKcmV0dXJucyBlYXJs eS4KCkFsc28gcmVtb3ZlIHRoZSBib2d1cyBjYWxsIHRvIGNsZWFyIHRoZSBpbnRlcmZhY2UgZGF0 YSwgd2hpY2ggaXMgb3duZWQKYnkgdGhlIHVzYm5ldCBkcml2ZXIgYW5kIHdvdWxkIG5vdCBldmVu IGhhdmUgYmVlbiBzZXQgYnkgdGhlIHRpbWUgYmluZCgpCmlzIGNhbGxlZC4KClNpZ25lZC1vZmYt Ynk6IEpvaGFuIEhvdm9sZCA8am9oYW5Aa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL25ldC91c2Iv a2FsbWlhLmMgfCA2ICstLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3VzYi9rYWxtaWEuYyBiL2RyaXZl cnMvbmV0L3VzYi9rYWxtaWEuYwppbmRleCAxZWM1MjNiMGU5MzIuLmJkMmJhMzY1OTAyOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9uZXQvdXNiL2thbG1pYS5jCisrKyBiL2RyaXZlcnMvbmV0L3VzYi9r YWxtaWEuYwpAQCAtMTUwLDEyICsxNTAsOCBAQCBrYWxtaWFfYmluZChzdHJ1Y3QgdXNibmV0ICpk ZXYsIHN0cnVjdCB1c2JfaW50ZXJmYWNlICppbnRmKQogCWRldi0+cnhfdXJiX3NpemUgPSBkZXYt PmhhcmRfbXR1ICogMTA7IC8vIEZvdW5kIGFzIG9wdGltYWwgYWZ0ZXIgdGVzdGluZwogCiAJc3Rh dHVzID0ga2FsbWlhX2luaXRfYW5kX2dldF9ldGhlcm5ldF9hZGRyKGRldiwgZXRoZXJuZXRfYWRk cik7Ci0KLQlpZiAoc3RhdHVzKSB7Ci0JCXVzYl9zZXRfaW50ZmRhdGEoaW50ZiwgTlVMTCk7Ci0J CXVzYl9kcml2ZXJfcmVsZWFzZV9pbnRlcmZhY2UoZHJpdmVyX29mKGludGYpLCBpbnRmKTsKKwlp ZiAoc3RhdHVzKQogCQlyZXR1cm4gc3RhdHVzOwotCX0KIAogCW1lbWNweShkZXYtPm5ldC0+ZGV2 X2FkZHIsIGV0aGVybmV0X2FkZHIsIEVUSF9BTEVOKTsKIAo=