diff options
| author | simokawa <simokawa@FreeBSD.org> | 2003-01-17 15:15:21 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2003-01-17 15:15:21 +0000 |
| commit | 5dc188b5c129034934bb9a472f6138e8b2ce95e3 (patch) | |
| tree | 1430272046e099c6300b2c70ec0b9ca93da50ea6 /sys/dev/firewire/fwdev.c | |
| parent | 48e65aa18811d4db5a1ae3a94b6cc3edb56d0bab (diff) | |
| download | FreeBSD-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/fwdev.c')
| -rw-r--r-- | sys/dev/firewire/fwdev.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c index 7e896f6..6c61bd9 100644 --- a/sys/dev/firewire/fwdev.c +++ b/sys/dev/firewire/fwdev.c @@ -593,13 +593,13 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td) sc->fc->it[sub]->flag |= FWXFERQ_DV; /* XXX check malloc failure */ sc->fc->it[sub]->dvbuf - = (struct fw_dvbuf *)malloc(sizeof(struct fw_dvbuf) * NDVCHUNK, M_DEVBUF, M_DONTWAIT); + = (struct fw_dvbuf *)malloc(sizeof(struct fw_dvbuf) * NDVCHUNK, M_DEVBUF, M_NOWAIT); STAILQ_INIT(&sc->fc->it[sub]->dvvalid); STAILQ_INIT(&sc->fc->it[sub]->dvfree); for( i = 0 ; i < NDVCHUNK ; i++){ /* XXX check malloc failure */ sc->fc->it[sub]->dvbuf[i].buf - = malloc(FWDVPMAX * sc->fc->it[sub]->dvpacket, M_DEVBUF, M_DONTWAIT); + = malloc(FWDVPMAX * sc->fc->it[sub]->dvpacket, M_DEVBUF, M_NOWAIT); STAILQ_INSERT_TAIL(&sc->fc->it[sub]->dvfree, &sc->fc->it[sub]->dvbuf[i], link); } @@ -625,12 +625,12 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td) return(EINVAL); } ir->bulkxfer - = (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->rx.nchunk, M_DEVBUF, M_DONTWAIT); + = (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->rx.nchunk, M_DEVBUF, M_NOWAIT); if(ir->bulkxfer == NULL){ return(ENOMEM); } it->bulkxfer - = (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->tx.nchunk, M_DEVBUF, M_DONTWAIT); + = (struct fw_bulkxfer *)malloc(sizeof(struct fw_bulkxfer) * ibufreq->tx.nchunk, M_DEVBUF, M_NOWAIT); if(it->bulkxfer == NULL){ return(ENOMEM); } @@ -639,7 +639,7 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td) /* XXX psize must be 2^n and less or equal to PAGE_SIZE */ * ((ibufreq->rx.psize + 3) &~3), - M_DEVBUF, M_DONTWAIT); + M_DEVBUF, M_NOWAIT); if(ir->buf == NULL){ free(ir->bulkxfer, M_DEVBUF); free(it->bulkxfer, M_DEVBUF); @@ -653,7 +653,7 @@ fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td) /* XXX psize must be 2^n and less or equal to PAGE_SIZE */ * ((ibufreq->tx.psize + 3) &~3), - M_DEVBUF, M_DONTWAIT); + M_DEVBUF, M_NOWAIT); if(it->buf == NULL){ free(ir->bulkxfer, M_DEVBUF); free(it->bulkxfer, M_DEVBUF); @@ -808,7 +808,7 @@ error: err = EINVAL; break; } - fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_DONTWAIT); + fwb = (struct fw_bind *)malloc(sizeof (struct fw_bind), M_DEVBUF, M_NOWAIT); if(fwb == NULL){ err = ENOMEM; break; |
