From c79a707072fe3fea0e3c92edee6ca85c1e53c29f Mon Sep 17 00:00:00 2001

From: Johan Hovold <johan@kernel.org>

Date: Thu, 18 Mar 2021 16:57:49 +0100

Subject: [PATCH] net: cdc-phonet: fix data-interface release on probe failure

Git-commit: c79a707072fe3fea0e3c92edee6ca85c1e53c29f

Patch-mainline: v5.12-rc5

References: git-fixes

Set the disconnected flag before releasing the data interface in case

netdev registration fails to avoid having the disconnect callback try to

deregister the never registered netdev (and trigger a WARN_ON()).

Fixes: 87cf65601e17 ("USB host CDC Phonet network interface driver")

Signed-off-by: Johan Hovold <johan@kernel.org>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/usb/cdc-phonet.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c

index 02e6bbb17b15..8d1f69dad603 100644

--- a/drivers/net/usb/cdc-phonet.c

+++ b/drivers/net/usb/cdc-phonet.c

@@ -387,6 +387,8 @@ static int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *i

 	err = register_netdev(dev);

 	if (err) {

+		/* Set disconnected flag so that disconnect() returns early. */

+		pnd->disconnected = 1;

 		usb_driver_release_interface(&usbpn_driver, data_intf);

 		goto out;

 	}

-- 

2.26.2