d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix forever broken ua_chan_setblocksize() uninitialized return value

Browse Source 
which causing divide by zero panic in other places (notably chn_sync()).
This commit is contained in:
Ariff Abdullah 2007-01-26 19:14:41 +00:00
parent 3ad47bdd54
commit b1d922169b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/sound/usb/uaudio_pcm.c
View File

@ -149,15 +149,21 @@ ua_chan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
device_t pa_dev;
struct ua_chinfo *ch = data;
struct ua_info *ua = ch->parent;
u_int32_t blkcnt;
RANGE(blocksize, 128, ua->bufsz / 2);
blkcnt = ua->bufsz / blocksize;
if ((sndbuf_getblksz(ch->buffer) != blocksize ||
sndbuf_getblkcnt(ch->buffer) != blkcnt) &&
sndbuf_resize(ch->buffer, blkcnt, blocksize) != 0)
device_printf(ua->sc_dev, "%s: failed blksz=%u blkcnt=%u\n",
__func__, blocksize, blkcnt);
ch->blksz = sndbuf_getblksz(ch->buffer);
if (blocksize) {
RANGE(blocksize, 128, ua->bufsz / 2);
if (sndbuf_resize(ch->buffer, ua->bufsz/blocksize, blocksize) != 0) {
ch->blksz = blocksize;
}
}
pa_dev = device_get_parent(ua->sc_dev);
uaudio_chan_set_param_blocksize(pa_dev, blocksize, ch->dir);
uaudio_chan_set_param_blocksize(pa_dev, ch->blksz, ch->dir);
return ch->blksz;
}