diff options
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/wdc_isa.c | 7 | ||||
| -rw-r--r-- | sys/dev/isa/wdc_isapnp.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c index 9ddd63146c3..5c683da88c1 100644 --- a/sys/dev/isa/wdc_isa.c +++ b/sys/dev/isa/wdc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_isa.c,v 1.13 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: wdc_isa.c,v 1.14 2011/05/09 22:33:54 matthew Exp $ */ /* $NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */ /*- @@ -164,10 +164,9 @@ wdc_isa_attach(struct device *parent, struct device *self, void *aux) sc->sc_wdcdev.nchannels = 1; sc->wdc_channel.channel = 0; sc->wdc_channel.wdc = &sc->sc_wdcdev; - sc->wdc_channel.ch_queue = malloc(sizeof(struct channel_queue), - M_DEVBUF, M_NOWAIT); + sc->wdc_channel.ch_queue = wdc_alloc_queue(); if (sc->wdc_channel.ch_queue == NULL) { - printf("%s: can't allocate memory for command queue", + printf("%s: cannot allocate channel queue", sc->sc_wdcdev.sc_dev.dv_xname); return; } diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c index 267ff3694ca..61d7c68d8a2 100644 --- a/sys/dev/isa/wdc_isapnp.c +++ b/sys/dev/isa/wdc_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_isapnp.c,v 1.8 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: wdc_isapnp.c,v 1.9 2011/05/09 22:33:54 matthew Exp $ */ /* $NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $ */ /*- @@ -135,10 +135,9 @@ wdc_isapnp_attach(parent, self, aux) sc->sc_wdcdev.nchannels = 1; sc->wdc_channel.channel = 0; sc->wdc_channel.wdc = &sc->sc_wdcdev; - sc->wdc_channel.ch_queue = malloc(sizeof(struct channel_queue), - M_DEVBUF, M_NOWAIT); + sc->wdc_channel.ch_queue = wdc_alloc_queue(); if (sc->wdc_channel.ch_queue == NULL) { - printf(": can't allocate memory for command queue\n"); + printf(": cannot allocate channel queue\n"); return; } |