diff options
| author | Johan Hovold <johan@kernel.org> | 2021-03-18 16:57:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-30 14:32:02 +0200 |
| commit | 421e0d731070fb497212ba929df3623cfce4561d (patch) | |
| tree | 1f336bf8a20c4675835a024d547720d56484cfd9 | |
| parent | 943e1583bf8a5cbcedfc4a00d92d8aac9e7e436d (diff) | |
| download | kernel_replicant_linux-421e0d731070fb497212ba929df3623cfce4561d.tar.gz kernel_replicant_linux-421e0d731070fb497212ba929df3623cfce4561d.tar.bz2 kernel_replicant_linux-421e0d731070fb497212ba929df3623cfce4561d.zip | |
net: cdc-phonet: fix data-interface release on probe failure
[ Upstream commit c79a707072fe3fea0e3c92edee6ca85c1e53c29f ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/usb/cdc-phonet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index dba847f28096..2520421946a6 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; } |