aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1997-10-23 19:00:16 +0000
committerNate Williams <nate@FreeBSD.org>1997-10-23 19:00:16 +0000
commit1030f4ea716bf19e1f24a0249e836847c187adeb (patch)
tree738b9fbe27ddd8579ed09885c2574e8712190c00 /sys
parentd63c6d1aaa691d786f33c842e322733eceeb12ef (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/pccard/pccard.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index aeefe5bc3ad2..949dff74c97e 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -654,10 +654,9 @@ inserted(void *arg)
*/
sp->pwr.vcc = 50;
sp->pwr.vpp = 0;
- if (sp->pwr_off_pending) {
- untimeout(power_off_slot, (caddr_t)sp, sp->poff_ch);
+ untimeout(power_off_slot, (caddr_t)sp, sp->poff_ch);
+ if (sp->pwr_off_pending)
sp->ctrl->disable(sp);
- }
sp->pwr_off_pending = 0;
sp->ctrl->power(sp);
printf("Card inserted, slot %d\n", sp->slot);