summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornate <nate@FreeBSD.org>1997-10-23 19:00:16 +0000
committernate <nate@FreeBSD.org>1997-10-23 19:00:16 +0000
commit26825b2fa5cabc92053279a931c2fb0bbcbde183 (patch)
tree06efe7d1f294205aceeec906befd343c678f86d7
parent7594bfff8ff5967e15ed271b205b3961ad13c253 (diff)
downloadFreeBSD-src-26825b2fa5cabc92053279a931c2fb0bbcbde183.zip
FreeBSD-src-26825b2fa5cabc92053279a931c2fb0bbcbde183.tar.gz
- Move the untimeout code call out of the check for pwr_off_pending. It
shouldn't make any difference, but did on a couple of test systems.
-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 aeefe5b..949dff7 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);
OpenPOWER on IntegriCloud