]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
r8152: Run the unload routine if we have errors during probe
authorDouglas Anderson <dianders@chromium.org>
Fri, 20 Oct 2023 21:06:53 +0000 (14:06 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Nov 2023 16:26:39 +0000 (17:26 +0100)
[ 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>
drivers/net/usb/r8152.c

index 89a1e40ff70058efe3356509c18c9f205d1c40d8..52056b296b9f768aa22446ada48d4c87044514a8 100644 (file)
@@ -9799,6 +9799,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);