summaryrefslogtreecommitdiff
path: root/sound/isa/sb/sb_common.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 09:46:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-13 09:46:22 -0700
commit63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (patch)
tree91240ae476d553bda4a92b52ff46823421798f6c /sound/isa/sb/sb_common.c
parenta8cd2e5045688157479a654786b2c08ab85f4d8f (diff)
parent676e1a2c1e7499eee8e7a81e577b4b6ba71ffb25 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
Diffstat (limited to 'sound/isa/sb/sb_common.c')
-rw-r--r--sound/isa/sb/sb_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index 5b6bde213ea0..f0f205ae425f 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -221,7 +221,7 @@ int snd_sbdsp_create(snd_card_t *card,
snd_assert(r_chip != NULL, return -EINVAL);
*r_chip = NULL;
- chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+ chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL)
return -ENOMEM;
spin_lock_init(&chip->reg_lock);