aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/gus/gus_main.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-24 00:26:49 -0400
commit98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch)
treef1682a68f65e0a38159f55a58c054779d749f8df /sound/isa/gus/gus_main.c
parentdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (diff)
parent87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/isa/gus/gus_main.c')
-rw-r--r--sound/isa/gus/gus_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index a636d9ce350..8f2872f8e8f 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -157,7 +157,7 @@ int snd_gus_create(snd_card_t * card,
};
*rgus = NULL;
- gus = kcalloc(1, sizeof(*gus), GFP_KERNEL);
+ gus = kzalloc(sizeof(*gus), GFP_KERNEL);
if (gus == NULL)
return -ENOMEM;
gus->gf1.irq = -1;