Commit bb8adff9 authored by Douglas Anderson's avatar Douglas Anderson Committed by David S. Miller
Browse files

r8152: Cancel hw_phy_work if we have an error in probe 



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: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarGrant Grundler <grundler@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5dd17689

drivers/net/usb/r8152.c

+1 −0
Original line number Diff line number Diff line
@@ -9783,6 +9783,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);