mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 17:13:52 +02:00
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
This commit is contained in:
parent
4f8d66a9fb
commit
daef020558
|
|
@ -328,7 +328,6 @@ static int ray_probe(struct pcmcia_device *p_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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user