diff options
| author | Rob Clark <robdclark@chromium.org> | 2025-04-29 13:42:29 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2025-04-29 13:42:29 -0700 |
| commit | 844e31bbaef7c8a6ff2c0fbac45c0c85b5484482 (patch) | |
| tree | 01d80b723a71bff43ffd866499f497e697a9766a /net/lapb/lapb_iface.c | |
| parent | 9d78f02503227d3554d26cf8ca73276105c98f3e (diff) | |
| parent | 0d607a59a0f6593e72630854a8bcb8b01b8dce40 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Merge drm-misc-next to get commit Fixes: fec450ca15af ("drm/display:
hdmi: provide central data authority for ACR params").
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'net/lapb/lapb_iface.c')
| -rw-r--r-- | net/lapb/lapb_iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index 0971ca48ba15..a0596e1f91da 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -194,8 +194,8 @@ int lapb_unregister(struct net_device *dev) spin_unlock_bh(&lapb->lock); /* Wait for running timers to stop */ - del_timer_sync(&lapb->t1timer); - del_timer_sync(&lapb->t2timer); + timer_delete_sync(&lapb->t1timer); + timer_delete_sync(&lapb->t2timer); __lapb_remove_cb(lapb); |