Commit daef0205 authored by Dongliang Mu's avatar Dongliang Mu Committed by Kalle Valo
Browse files

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: default avatarDongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230316133236.556198-2-dzm91@hust.edu.cn
parent 4f8d66a9

drivers/net/wireless/legacy/ray_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -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);