summaryrefslogtreecommitdiffstats
path: root/sys/dev/firewire/fwohci.c
diff options
context:
space:
mode:
authorsimokawa <simokawa@FreeBSD.org>2003-01-17 15:15:21 +0000
committersimokawa <simokawa@FreeBSD.org>2003-01-17 15:15:21 +0000
commit5dc188b5c129034934bb9a472f6138e8b2ce95e3 (patch)
tree1430272046e099c6300b2c70ec0b9ca93da50ea6 /sys/dev/firewire/fwohci.c
parent48e65aa18811d4db5a1ae3a94b6cc3edb56d0bab (diff)
downloadFreeBSD-src-5dc188b5c129034934bb9a472f6138e8b2ce95e3.zip
FreeBSD-src-5dc188b5c129034934bb9a472f6138e8b2ce95e3.tar.gz
Replace M_DONTWAIT with M_NOWAIT for malloc().
Pointed out by: nate@root.org
Diffstat (limited to 'sys/dev/firewire/fwohci.c')
-rw-r--r--sys/dev/firewire/fwohci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 8a91272..b07cf08 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -1141,7 +1141,7 @@ fwohci_db_init(struct fwohci_dbch *dbch)
STAILQ_INIT(&dbch->db_trq);
db_tr = (struct fwohcidb_tr *)
malloc(sizeof(struct fwohcidb_tr) * dbch->ndb,
- M_DEVBUF, M_DONTWAIT | M_ZERO);
+ M_DEVBUF, M_NOWAIT | M_ZERO);
if(db_tr == NULL){
printf("fwohci_db_init: malloc(1) failed\n");
return;
@@ -1159,7 +1159,7 @@ fwohci_db_init(struct fwohci_dbch *dbch)
}
for (i = 0; i < dbch->npages; i++) {
dbch->pages[i] = malloc(PAGE_SIZE, M_DEVBUF,
- M_DONTWAIT | M_ZERO);
+ M_NOWAIT | M_ZERO);
if (dbch->pages[i] == NULL) {
printf("fwohci_db_init: malloc(2) failed\n");
for (j = 0; j < i; j ++)
@@ -1552,7 +1552,7 @@ fwohci_irxbuf_enable(struct firewire_comm *fc, int dmach)
sc->ir[dmach].xferq.bnchunk;
sc->ir[dmach].dummy =
malloc(sizeof(u_int32_t) * sc->ir[dmach].ndb,
- M_DEVBUF, M_DONTWAIT);
+ M_DEVBUF, M_NOWAIT);
if(sc->ir[dmach].dummy == NULL){
err = ENOMEM;
return err;
OpenPOWER on IntegriCloud