Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1128761pxj; Fri, 4 Jun 2021 06:46:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzClRhCuQjFLBec28t1ZVAO/dyJy6qJhpgak/ulJNcBT45hmaKEDYGJpEdatilvSc13Ozdf X-Received: by 2002:a17:906:36d4:: with SMTP id b20mr4268787ejc.44.1622814391518; Fri, 04 Jun 2021 06:46:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622814391; cv=none; d=google.com; s=arc-20160816; b=FktkDZWop81DTBvp5WFgtJRG1gbw49dLzzN7ae3XZ93SUsPNbgASKQ02VNcowFmbk9 n5CcPTjg+g0hcwQUBsp6RLh59dv9663Lc4371K1YLOPy1NcfNrSJDy2EQ7g+a96Gu2bv TO590iwn5x0UpXfYD5M2UhDYUW+xmMy0N8dWStEDDCvHHw24brCDFJdDmtp6TN225T+t vmk69TzpgYKU64p6S1YwMbF9q1ZUYIwkHwuks+hCPA4CJKHPYSENyMFaITyBz1CnSUSF ByB0FfR4C4vQuxKxzGIHNcFvFd85Vnu7tNL4P+YLwX0VhIaY9cCWGw9oyKuv3QeBzCcn ECEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=sns9JmDHPiXkEg+mKUTQOVteAT1kMfc/Q132LWi479Q=; b=v0HlR6/32trmjqnDwvi8Dt1MxZVZDK3tNModD+TwQ883TcCsGAXutnwp6zbnctOSdr w/WHPuGAO2BVw6aH5g10F69xB8xHtrlGWSSTSAtljh7w4bR3JcR+rrfAz/YLtV1awiZQ 0Kp8isiYxFavs9whRCkDdtLAUbvii7SUXj/8Jalwl/MWL86RJmKuGn9+ucrKqLncHbvB isNpLUJD8IRDfgzeex0/QbwGaZ7woEOAq5cmMpCMa/Uz/eMFWH+Miuvh48ZoKsVldZ7d BXSD9lZeEKngxM3XfPY3PrUEL5qMz9iH1KIDOOqXFXkxotbAHHmVUc0HKEo2p2aQetPy MP0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p2si4958870edh.431.2021.06.04.06.46.08; Fri, 04 Jun 2021 06:46:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230403AbhFDNoz (ORCPT + 99 others); Fri, 4 Jun 2021 09:44:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230331AbhFDNom (ORCPT ); Fri, 4 Jun 2021 09:44:42 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 388A7C06178B for ; Fri, 4 Jun 2021 06:42:54 -0700 (PDT) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lpA63-00072r-H4; Fri, 04 Jun 2021 15:42:47 +0200 Received: from ore by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lpA61-0000g4-MU; Fri, 04 Jun 2021 15:42:45 +0200 From: Oleksij Rempel To: "David S. Miller" , Jakub Kicinski , Andrew Lunn , Heiner Kallweit , Russell King Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next v1 7/7] usbnet: run unbind() before unregister_netdev() Date: Fri, 4 Jun 2021 15:42:44 +0200 Message-Id: <20210604134244.2467-8-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210604134244.2467-1-o.rempel@pengutronix.de> References: <20210604134244.2467-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org unbind() is the proper place to disconnect PHY, but it will fail if netdev is already unregistered. Signed-off-by: Oleksij Rempel --- drivers/net/usb/usbnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index ecf62849f4c1..57a5a025255c 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1597,6 +1597,9 @@ void usbnet_disconnect (struct usb_interface *intf) xdev->bus->bus_name, xdev->devpath, dev->driver_info->description); + if (dev->driver_info->unbind) + dev->driver_info->unbind(dev, intf); + net = dev->net; unregister_netdev (net); @@ -1604,9 +1607,6 @@ void usbnet_disconnect (struct usb_interface *intf) usb_scuttle_anchored_urbs(&dev->deferred); - if (dev->driver_info->unbind) - dev->driver_info->unbind (dev, intf); - usb_kill_urb(dev->interrupt); usb_free_urb(dev->interrupt); kfree(dev->padding_pkt); -- 2.29.2