git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
drivers
/
vx
/
vx_pcm.c
diff --git
a/sound/drivers/vx/vx_pcm.c
b/sound/drivers/vx/vx_pcm.c
index
c4af849
..
7e65a10
100644
(file)
--- a/
sound/drivers/vx/vx_pcm.c
+++ b/
sound/drivers/vx/vx_pcm.c
@@
-1252,18
+1252,15
@@
static int vx_init_audio_io(struct vx_core *chip)
chip->audio_info = rmh.Stat[1];
/* allocate pipes */
chip->audio_info = rmh.Stat[1];
/* allocate pipes */
- chip->playback_pipes = k
malloc(sizeof(struct vx_pipe *) * chip->audio_outs
, GFP_KERNEL);
+ chip->playback_pipes = k
calloc(chip->audio_outs, sizeof(struct vx_pipe *)
, GFP_KERNEL);
if (!chip->playback_pipes)
return -ENOMEM;
if (!chip->playback_pipes)
return -ENOMEM;
- chip->capture_pipes = k
malloc(sizeof(struct vx_pipe *) * chip->audio_ins
, GFP_KERNEL);
+ chip->capture_pipes = k
calloc(chip->audio_ins, sizeof(struct vx_pipe *)
, GFP_KERNEL);
if (!chip->capture_pipes) {
kfree(chip->playback_pipes);
return -ENOMEM;
}
if (!chip->capture_pipes) {
kfree(chip->playback_pipes);
return -ENOMEM;
}
- memset(chip->playback_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_outs);
- memset(chip->capture_pipes, 0, sizeof(struct vx_pipe *) * chip->audio_ins);
-
preferred = chip->ibl.size;
chip->ibl.size = 0;
vx_set_ibl(chip, &chip->ibl); /* query the info */
preferred = chip->ibl.size;
chip->ibl.size = 0;
vx_set_ibl(chip, &chip->ibl); /* query the info */