diff options
Diffstat (limited to 'drivers/scsi/pcmcia/qlogic_stub.c')
| -rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index c3f1d03a5..bcbbecfb8 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -2,7 +2,7 @@ A driver for the Qlogic SCSI card - qlogic_cs.c 1.77 2000/02/01 19:08:09 + qlogic_cs.c 1.78 2000/05/04 01:30:00 The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file @@ -66,7 +66,7 @@ static int pc_debug = PCMCIA_DEBUG; MODULE_PARM(pc_debug, "i"); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = -"qlogic_cs.c 1.77 2000/02/01 19:08:09 (David Hinds)"; +"qlogic_cs.c 1.78 2000/05/04 01:30:00 (David Hinds)"; #else #define DEBUG(n, args...) #endif @@ -182,6 +182,7 @@ static void qlogic_detach(dev_link_t *link) if (*linkp == NULL) return; + del_timer(&link->release); if (link->state & DEV_CONFIG) { qlogic_release((u_long)link); if (link->state & DEV_STALE_CONFIG) { @@ -365,10 +366,8 @@ static int qlogic_event(event_t event, int priority, switch (event) { case CS_EVENT_CARD_REMOVAL: link->state &= ~DEV_PRESENT; - if (link->state & DEV_CONFIG) { - link->release.expires = jiffies + HZ/20; - add_timer(&link->release); - } + if (link->state & DEV_CONFIG) + mod_timer(&link->release, jiffies + HZ/20); break; case CS_EVENT_CARD_INSERTION: link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; |