From: Jason Andryuk <jandryuk@gmail.com>
To: Kalle Valo <kalle.valo@iki.fi>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: [PATCH] at76c50x-usb: additional disconnect fixes
Date: Wed, 18 Feb 2009 22:25:48 -0500 [thread overview]
Message-ID: <1235013948.6344.12.camel@rainbow> (raw)
In-Reply-To: <87wsbnpiws.fsf@litku.valot.fi>
Additional attempts to fix Oops on disconnect, that appear to be successful. However,
some may be extraneous.
The cancel_delayed_work call is probably the most necessary. The device_unplugged
check may not be necessary. del_timer_sync may not be necessary either, but the Oops
I was receiving was related to timers. Hence the addition.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
--
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 7a03251..52b0be5 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1497,6 +1497,9 @@ static void at76_work_set_promisc(struct work_struct *work)
work_set_promisc);
int ret = 0;
+ if (priv->device_unplugged)
+ return;
+
mutex_lock(&priv->mtx);
priv->mib_buf.type = MIB_LOCAL;
@@ -2297,6 +2300,7 @@ static void at76_delete_device(struct at76_priv *priv)
tasklet_kill(&priv->rx_tasklet);
if (priv->mac80211_registered) {
+ cancel_delayed_work(&priv->dwork_hw_scan);
flush_workqueue(priv->hw->workqueue);
ieee80211_unregister_hw(priv->hw);
}
@@ -2314,6 +2318,8 @@ static void at76_delete_device(struct at76_priv *priv)
kfree(priv->bulk_out_buffer);
+ del_timer_sync(&ledtrig_tx_timer);
+
if (priv->rx_skb)
kfree_skb(priv->rx_skb);
next prev parent reply other threads:[~2009-02-19 3:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 4:03 [PATCH] at76_usb: fix Oops on disconnect Jason Andryuk
2009-02-07 11:29 ` Kalle Valo
2009-02-09 3:47 ` Jason Andryuk
2009-02-18 20:52 ` Kalle Valo
2009-02-19 3:25 ` Jason Andryuk [this message]
2009-02-19 6:24 ` [PATCH] at76c50x-usb: additional disconnect fixes Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1235013948.6344.12.camel@rainbow \
--to=jandryuk@gmail.com \
--cc=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).