From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-kernel@vger.kernel.org, torvalds@transmeta.com
Subject: PATCH: fix further timer in pcmcia stuff
Date: Fri, 11 Jul 2003 19:07:15 +0100 [thread overview]
Message-ID: <200307111807.h6BI7FfR017254@hraefn.swansea.linux.org.uk> (raw)
#ra1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.75/drivers/net/pcmcia/pcnet_cs.c linux-2.5.75-ac1/drivers/net/pcmcia/pcnet_cs.c
--- linux-2.5.75/drivers/net/pcmcia/pcnet_cs.c 2003-07-10 21:13:34.000000000 +0100
+++ linux-2.5.75-ac1/drivers/net/pcmcia/pcnet_cs.c 2003-07-11 15:22:26.000000000 +0100
@@ -357,7 +357,7 @@
if (*linkp == NULL)
return;
- del_timer(&link->release);
+ del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) {
pcnet_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) {
@@ -1052,7 +1052,7 @@
link->open--;
netif_stop_queue(dev);
- del_timer(&info->watchdog);
+ del_timer_sync(&info->watchdog);
if (link->state & DEV_STALE_CONFIG)
mod_timer(&link->release, jiffies + HZ/20);
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.75/drivers/net/pcmcia/smc91c92_cs.c linux-2.5.75-ac1/drivers/net/pcmcia/smc91c92_cs.c
--- linux-2.5.75/drivers/net/pcmcia/smc91c92_cs.c 2003-07-10 21:12:18.000000000 +0100
+++ linux-2.5.75-ac1/drivers/net/pcmcia/smc91c92_cs.c 2003-07-11 15:22:40.000000000 +0100
@@ -433,7 +433,7 @@
if (*linkp == NULL)
return;
- del_timer(&link->release);
+ del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) {
smc91c92_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) {
@@ -1330,7 +1330,7 @@
outw(CTL_POWERDOWN, ioaddr + CONTROL );
link->open--;
- del_timer(&smc->media);
+ del_timer_sync(&smc->media);
if (link->state & DEV_STALE_CONFIG)
mod_timer(&link->release, jiffies + HZ/20);
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.75/drivers/net/pcmcia/xirc2ps_cs.c linux-2.5.75-ac1/drivers/net/pcmcia/xirc2ps_cs.c
--- linux-2.5.75/drivers/net/pcmcia/xirc2ps_cs.c 2003-07-10 21:08:16.000000000 +0100
+++ linux-2.5.75-ac1/drivers/net/pcmcia/xirc2ps_cs.c 2003-07-11 15:22:49.000000000 +0100
@@ -689,7 +689,7 @@
* the release() function is called, that will trigger a proper
* detach().
*/
- del_timer(&link->release);
+ del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) {
xirc2ps_release((unsigned long)link);
if (link->state & DEV_STALE_CONFIG) {
reply other threads:[~2003-07-11 17:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200307111807.h6BI7FfR017254@hraefn.swansea.linux.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/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).