diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:46:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 12:46:22 -0400 |
commit | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (patch) | |
tree | 91240ae476d553bda4a92b52ff46823421798f6c /sound/isa/sb/emu8000_pcm.c | |
parent | a8cd2e5045688157479a654786b2c08ab85f4d8f (diff) | |
parent | 676e1a2c1e7499eee8e7a81e577b4b6ba71ffb25 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
Diffstat (limited to 'sound/isa/sb/emu8000_pcm.c')
-rw-r--r-- | sound/isa/sb/emu8000_pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c index db5eb8b55058..0209790dc4b5 100644 --- a/sound/isa/sb/emu8000_pcm.c +++ b/sound/isa/sb/emu8000_pcm.c | |||
@@ -233,7 +233,7 @@ static int emu8k_pcm_open(snd_pcm_substream_t *subs) | |||
233 | emu8k_pcm_t *rec; | 233 | emu8k_pcm_t *rec; |
234 | snd_pcm_runtime_t *runtime = subs->runtime; | 234 | snd_pcm_runtime_t *runtime = subs->runtime; |
235 | 235 | ||
236 | rec = kcalloc(1, sizeof(*rec), GFP_KERNEL); | 236 | rec = kzalloc(sizeof(*rec), GFP_KERNEL); |
237 | if (! rec) | 237 | if (! rec) |
238 | return -ENOMEM; | 238 | return -ENOMEM; |
239 | 239 | ||