diff options
| author | Douglas Anderson <dianders@chromium.org> | 2023-10-20 14:06:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-22 11:46:17 +0100 |
| commit | bb8adff9123e492598162ac1baad01a53891aef6 (patch) | |
| tree | e96cc463bbae48b3a2248e313b70609c395d3435 /drivers/net/usb | |
| parent | 5dd17689526971c5ae12bc8398f34bd68cd0499e (diff) | |
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: a028a9e003f2 ("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>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 201c688e3e3f..d10b0886b652 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -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); |