Commit 29cb3f81 authored Oct 20, 2023 by Douglas Anderson Committed by Greg Kroah-Hartman Nov 08, 2023

r8152: Cancel hw_phy_work if we have an error in probe



[ Upstream commit bb8adff9123e492598162ac1baad01a53891aef6 ]

The error handling in rtl8152_probe() is missing a call to cancel the
hw_phy_work. Add it in to match what's in the cleanup code in
rtl8152_disconnect().

Fixes: a028a9e0 ("r8152: move the settings of PHY to a work queue")
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>

parent 6124d0b1

drivers/net/usb/r8152.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -5779,6 +5779,7 @@ static int rtl8152_probe(struct usb_interface *intf,

		out1:
		tasklet_kill(&tp->tx_tl);
		cancel_delayed_work_sync(&tp->hw_phy_work);
		if (tp->rtl_ops.unload)
		tp->rtl_ops.unload(tp);
		usb_set_intfdata(intf, NULL);