diff options
| author | Dongliang Mu <dzm91@hust.edu.cn> | 2023-03-16 21:32:35 +0800 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-05-27 11:30:28 +0300 |
| commit | daef020558bc34e8031263aa7cf9e803d709f93a (patch) | |
| tree | a79e71bf0f6c14dc502c02a7a4babfa755b02834 /drivers/net/wireless/legacy | |
| parent | 4f8d66a9fb2edcd05c1e563456a55a08910bfb37 (diff) | |
| download | linux-stable-daef020558bc34e8031263aa7cf9e803d709f93a.tar.gz linux-stable-daef020558bc34e8031263aa7cf9e803d709f93a.tar.bz2 linux-stable-daef020558bc34e8031263aa7cf9e803d709f93a.zip | |
wifi: ray_cs: remove one redundant del_timer
In ray_detach, it and its child function ray_release both call
del_timer(_sync) on the same timer.
Fix this by removing the del_timer_sync in the ray_detach, and revising
the del_timer to del_timer_sync.
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230316133236.556198-2-dzm91@hust.edu.cn
Diffstat (limited to 'drivers/net/wireless/legacy')
| -rw-r--r-- | drivers/net/wireless/legacy/ray_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c index 38782d4c4694..93eaf3dba6a9 100644 --- a/drivers/net/wireless/legacy/ray_cs.c +++ b/drivers/net/wireless/legacy/ray_cs.c @@ -328,7 +328,6 @@ err_free_dev: static void ray_detach(struct pcmcia_device *link) { struct net_device *dev; - ray_dev_t *local; dev_dbg(&link->dev, "ray_detach\n"); @@ -337,9 +336,6 @@ static void ray_detach(struct pcmcia_device *link) ray_release(link); - local = netdev_priv(dev); - del_timer_sync(&local->timer); - if (link->priv) { unregister_netdev(dev); free_netdev(dev); @@ -740,7 +736,7 @@ static void ray_release(struct pcmcia_device *link) dev_dbg(&link->dev, "ray_release\n"); - del_timer(&local->timer); + del_timer_sync(&local->timer); iounmap(local->sram); iounmap(local->rmem); |