Skip to content

Commit bb8adff

Browse files
diandersdavem330
authored andcommitted
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: a028a9e ("r8152: move the settings of PHY to a work queue") Signed-off-by: Douglas Anderson <[email protected]> Reviewed-by: Grant Grundler <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5dd1768 commit bb8adff

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/net/usb/r8152.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9783,6 +9783,7 @@ static int rtl8152_probe(struct usb_interface *intf,
97839783

97849784
out1:
97859785
tasklet_kill(&tp->tx_tl);
9786+
cancel_delayed_work_sync(&tp->hw_phy_work);
97869787
if (tp->rtl_ops.unload)
97879788
tp->rtl_ops.unload(tp);
97889789
usb_set_intfdata(intf, NULL);

0 commit comments

Comments
 (0)