diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 17:09:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 17:09:11 +1000 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /sound/drivers | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'sound/drivers')
| -rw-r--r-- | sound/drivers/vx/vx_pcm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c index c4af84995d05..7e65a103fbb2 100644 --- 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->playback_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_outs, GFP_KERNEL); + chip->playback_pipes = kcalloc(chip->audio_outs, sizeof(struct vx_pipe *), GFP_KERNEL); if (!chip->playback_pipes) return -ENOMEM; - chip->capture_pipes = kmalloc(sizeof(struct vx_pipe *) * chip->audio_ins, GFP_KERNEL); + chip->capture_pipes = kcalloc(chip->audio_ins, sizeof(struct vx_pipe *), GFP_KERNEL); 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 */ |