summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2023-10-20 14:06:53 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-08 17:30:42 +0100
commit7dc907d855df3bf22c63dd1425973632540716a4 (patch)
tree93ff9e50596b4d7256d69ede413ee25be1fead1a /drivers
parent704c25fc6abd7a5a4d27f0ef53e5e0fda66c37b7 (diff)
downloadlinux-7dc907d855df3bf22c63dd1425973632540716a4.tar.gz
linux-7dc907d855df3bf22c63dd1425973632540716a4.tar.bz2
linux-7dc907d855df3bf22c63dd1425973632540716a4.zip
r8152: Run the unload routine if we have errors during probe
[ Upstream commit 5dd17689526971c5ae12bc8398f34bd68cd0499e ] The rtl8152_probe() function lacks a call to the chip-specific unload() routine when it sees an error in probe. Add it in to match the cleanup code in rtl8152_disconnect(). Fixes: ac718b69301c ("net/usb: new driver for RTL8152") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Grant Grundler <grundler@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/r8152.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index d0ab761dad18..517334aab278 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -6825,6 +6825,8 @@ static int rtl8152_probe(struct usb_interface *intf,
out1:
tasklet_kill(&tp->tx_tl);
+ if (tp->rtl_ops.unload)
+ tp->rtl_ops.unload(tp);
usb_set_intfdata(intf, NULL);
out:
free_netdev(netdev);