lkml.org 
[lkml]   [2023]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] wifi: ray_cs: remove one redundant del_timer
Date
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>
---
drivers/net/wireless/ray_cs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1f57a0055bbd..785a5be72b2b 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -331,9 +331,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);
@@ -734,7 +731,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);
--
2.39.2
\
 
 \ /
  Last update: 2023-03-27 00:56    [W:1.439 / U:0.000 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site