diff options
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardslot.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 123ff3b5fc3..88bf36491bb 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.9 2004/01/26 19:12:52 fgsch Exp $ */ +/* $OpenBSD: cardbus.c,v 1.10 2004/05/04 16:59:31 grange Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -253,7 +253,7 @@ cardbus_read_tuples(ca, cis_ptr, tuples, len) break; } while((p = SIMPLEQ_FIRST(&rom_image)) != NULL) { - SIMPLEQ_REMOVE_HEAD(&rom_image, p, next); + SIMPLEQ_REMOVE_HEAD(&rom_image, next); free(p, M_DEVBUF); } out: diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index b315e63f602..5516e39db41 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardslot.c,v 1.3 2003/10/21 10:07:33 jmc Exp $ */ +/* $OpenBSD: cardslot.c,v 1.4 2004/05/04 16:59:31 grange Exp $ */ /* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */ /* @@ -314,7 +314,7 @@ cardslot_event_thread(arg) (void) tsleep(&sc->sc_events, PWAIT, "cardslotev", 0); continue; } - SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce, ce_q); + SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q); splx(s); if (IS_CARDSLOT_INSERT_REMOVE_EV(ce->ce_type)) { @@ -333,9 +333,9 @@ cardslot_event_thread(arg) break; } if (ce2->ce_type == ce->ce_type) { - SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce1, ce_q); + SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q); free(ce1, M_TEMP); - SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce2, ce_q); + SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q); free(ce2, M_TEMP); } } |