From patchwork Wed Mar 7 09:46:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 882517 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UQL8LvrI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zx82670yFz9sd6 for ; Wed, 7 Mar 2018 20:47:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751248AbeCGJrY (ORCPT ); Wed, 7 Mar 2018 04:47:24 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:43421 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751075AbeCGJrU (ORCPT ); Wed, 7 Mar 2018 04:47:20 -0500 Received: by mail-lf0-f65.google.com with SMTP id q69-v6so2269350lfi.10; Wed, 07 Mar 2018 01:47:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7Hxeg7w5UT8RtrR8cZxgaqvZfE/KWEZEht3KgTE/dnE=; b=UQL8LvrI7nVquSpyeLdbkV1uVWVPneAyKv2q74WWor7/hyok2J7Mn7B/WGzrOUCuVh ID2X3aAVhnogeIxXQdbQ2yKmFix5Bj2OTlnPfotzzUS7KiyD5Nu7/x9XZZ+SKuNcLheC 7gBkFd2LLKNycM5CSobaCjjfKosO+Of/CPS/uyZ4nQRedQSrMBClVUvIHl9PA3qc12LZ +1pe+MvSMERyvn9dM7FLCyH8Z/o2+e6iqGdHOFH8gbHvO1tzxDt02MPVVc/2WasSJEI/ KWGHSf5LINELAx9oxE0NR9bDNEL04Vkh+7tbl68C8i71lHDPOLRx2lfJ/XpAS9NedA3x MVHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7Hxeg7w5UT8RtrR8cZxgaqvZfE/KWEZEht3KgTE/dnE=; b=QRQT+SDTXdIqR4uUyOOLRBQJ8W879ZDA2YRYI9kuJTn7y/SdKCyuDqKSJCVX0kHFZ9 rAjFjGYMtywNAjwe3Ru43iBiqwyD1jM696AHy+fze8/QYDsio5+mgvW09q+ecTlSh4dr PkRpN6mBZR1u/I0qhhYIwLe2xPbQospkq7I69oIzq1ZFHUbSjeWPCm2FiNeNtl8YqW5G i76WEbm1oafK/yh75LNVG+esmaGVzjlWgLQakO5qXtGSTz0Pipz106/PtDi9qSEOQR6y eHsFQuwBTfjzjRI4MWCPMt9LcB5LcytQ2x57SGpkCwgAUMEkJ/39sJGuHYzNkt8KJQT2 WHzA== X-Gm-Message-State: AElRT7Hxn/fJUDIQEcR9ZsQgxChPGX0mQVNrw5ub0h9Rz4UYObRcFBf0 gRATPeWPAnnXORwxMMNvIBk= X-Google-Smtp-Source: AG47ELvy8hgJAqQH1Yiax6/5wh8/Tt69OUau26c6+39E7itzRnNmTd/horhez2o+IxOrOcLKzOK5rg== X-Received: by 10.25.17.212 with SMTP id 81mr16273680lfr.85.1520416038647; Wed, 07 Mar 2018 01:47:18 -0800 (PST) Received: from xi.terra (c-8bb2e655.07-184-6d6c6d4.cust.bredbandsbolaget.se. [85.230.178.139]) by smtp.gmail.com with ESMTPSA id h11sm3562871lfd.88.2018.03.07.01.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 01:47:17 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1etVfM-0002M4-Ks; Wed, 07 Mar 2018 10:47:20 +0100 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 2/2] net: cdc_eem: clean up bind error path Date: Wed, 7 Mar 2018 10:46:58 +0100 Message-Id: <20180307094658.9008-2-johan@kernel.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180307094658.9008-1-johan@kernel.org> References: <20180307094658.9008-1-johan@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Oliver Neukum Reviewed-by: Greg Kroah-Hartman --- drivers/net/usb/cdc_eem.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index f7180f8db39e..61ea4eaace5d 100644 --- a/drivers/net/usb/cdc_eem.c +++ b/drivers/net/usb/cdc_eem.c @@ -83,11 +83,8 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf) int status = 0; status = usbnet_get_endpoints(dev, intf); - if (status < 0) { - usb_set_intfdata(intf, NULL); - usb_driver_release_interface(driver_of(intf), intf); + if (status < 0) return status; - } /* no jumbogram (16K) support for now */