diff options
| author | guido <guido@FreeBSD.org> | 1999-02-14 20:41:01 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 1999-02-14 20:41:01 +0000 |
| commit | 1c6e740053731732fee8859bb98031bac6e154e4 (patch) | |
| tree | 48db87837c24dfab69822d033d4b8bbd0809ffc5 /sys | |
| parent | afbd37932c2d1866e565581b0928781b73f59fa9 (diff) | |
| download | FreeBSD-src-1c6e740053731732fee8859bb98031bac6e154e4.zip FreeBSD-src-1c6e740053731732fee8859bb98031bac6e154e4.tar.gz | |
On second thought: do previous fux in pcic.c better.
Now we just untimeout the call to inserted() if it exists.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pccard/pccard.c | 3 | ||||
| -rw-r--r-- | sys/pccard/pcic.c | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 5783bac..dd76c24 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pccard.c,v 1.70 1999/01/27 23:45:40 dillon Exp $ + * $Id: pccard.c,v 1.71 1999/02/13 11:31:59 kuriyama Exp $ */ #include "opt_devfs.h" @@ -430,6 +430,7 @@ slot_resume(void *arg) slt->laststate = suspend; slt->state = empty; slt->insert_seq = 1; + untimeout(inserted, (void *)slt, slt->insert_ch); slt->insert_ch = timeout(inserted, (void *)slt, hz/4); selwakeup(&slt->selp); } diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index 4514dbc..651c1d5 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -1104,14 +1104,7 @@ pcicintr(void *unused) #endif /* PC98 */ s = splhigh(); for (slot = 0; slot < PCIC_MAX_SLOTS; slot++, sp++) - /* - * don't process this interrupt if we are in suspend - * state; we have different means to (re)initialize the - * slot. - * XXX we shouldn't even get here!? - */ - if (sp->slt && (sp->slt->state != suspend) && - (chg = sp->getb(sp, PCIC_STAT_CHG)) != 0) + if (sp->slt && (chg = sp->getb(sp, PCIC_STAT_CHG)) != 0) if (chg & PCIC_CDTCH) { if ((sp->getb(sp, PCIC_STATUS) & PCIC_CD) == PCIC_CD) { |
