mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-18 02:19:39 +00:00
Code Issues Releases Activity

sound: Stop checking for failures from malloc(M_WAITOK)

Browse Source 
Reviewed by:	emaste
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D45852

(cherry picked from commit 59121599bb)
(cherry picked from commit bfcaaff418)
This commit is contained in:
Zhenlei Huang 2024-09-03 18:25:33 +08:00
parent 68c96d15d3
commit 36fb983d22
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/sound/macio/i2s.c
View File

@ -242,10 +242,8 @@ i2s_attach(device_t self)
* Register a hook for delayed attach in order to allow
* the I2C controller to attach.
*/
if ((i2s_delayed_attach = malloc(sizeof(struct intr_config_hook),
M_TEMP, M_WAITOK | M_ZERO)) == NULL)
return (ENOMEM);
i2s_delayed_attach = malloc(sizeof(struct intr_config_hook),
M_TEMP, M_WAITOK | M_ZERO);
i2s_delayed_attach->ich_func = i2s_postattach;
i2s_delayed_attach->ich_arg = sc;

44
sys/dev/sound/usb/uaudio.c
View File

@ -2634,8 +2634,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b,
DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size);
ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO);
if (ch->buf == NULL)
goto error;
if (sndbuf_setup(b, ch->buf, buf_size) != 0)
goto error;
@ -3204,31 +3202,27 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc)
malloc(sizeof(*p_mc_new), M_USBDEV, M_WAITOK);
int ch;
if (p_mc_new != NULL) {
memcpy(p_mc_new, mc, sizeof(*p_mc_new));
p_mc_new->next = sc->sc_mixer_root;
sc->sc_mixer_root = p_mc_new;
sc->sc_mixer_count++;
memcpy(p_mc_new, mc, sizeof(*p_mc_new));
p_mc_new->next = sc->sc_mixer_root;
sc->sc_mixer_root = p_mc_new;
sc->sc_mixer_count++;
/* set default value for all channels */
for (ch = 0; ch < p_mc_new->nchan; ch++) {
switch (p_mc_new->val_default) {
case 1:
/* 50% */
p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2;
break;
case 2:
/* 100% */
p_mc_new->wData[ch] = p_mc_new->maxval;
break;
default:
/* 0% */
p_mc_new->wData[ch] = p_mc_new->minval;
break;
}
/* set default value for all channels */
for (ch = 0; ch < p_mc_new->nchan; ch++) {
switch (p_mc_new->val_default) {
case 1:
/* 50% */
p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2;
break;
case 2:
/* 100% */
p_mc_new->wData[ch] = p_mc_new->maxval;
break;
default:
/* 0% */
p_mc_new->wData[ch] = p_mc_new->minval;
break;
}
} else {
DPRINTF("out of memory\n");
}
}