diff options
Diffstat (limited to 'sys/dev/flash.c')
| -rw-r--r-- | sys/dev/flash.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/flash.c b/sys/dev/flash.c index c6ea5ccb26b..e7918184463 100644 --- a/sys/dev/flash.c +++ b/sys/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.9 2008/06/15 00:36:41 krw Exp $ */ +/* $OpenBSD: flash.c,v 1.10 2009/06/03 22:09:30 thib Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -814,7 +814,7 @@ flashstrategy(struct buf *bp) /* Queue the transfer. */ s = splbio(); - disksort(&sc->sc_q, bp); + BUFQ_ADD(sc->sc_dk.dk_bufq, bp); flashstart(sc); splx(s); device_unref(&sc->sc_dev); @@ -881,11 +881,9 @@ flashstart(struct flash_softc *sc) while (1) { /* Remove the next buffer from the queue or stop. */ - dp = &sc->sc_q; - bp = dp->b_actf; + bp = BUFQ_GET(sc->sc_dk.dk_bufq); if (bp == NULL) return; - dp->b_actf = bp->b_actf; /* Transfer this buffer now. */ _flashstart(sc, bp); |