diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-07-25 09:28:03 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-08-03 09:21:18 -0400 |
commit | 59feddb25f9d925e86ee22596802405788bc050f (patch) | |
tree | 0d272bdcb64cf2bcc19adf8735215ce261aea355 /sound/ppc/tumbler.c | |
parent | fb6a0d635d4ff6b3555179d0154981f03427071a (diff) |
[ALSA] Conversions from kmalloc+memset to k(z|c)alloc
sound: Conversions from kmalloc+memset to k(c|z)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/ppc/tumbler.c')
-rw-r--r-- | sound/ppc/tumbler.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 692c61177678..84f6b19c07ca 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -1316,10 +1316,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1316 | request_module("i2c-powermac"); | 1316 | request_module("i2c-powermac"); |
1317 | #endif /* CONFIG_KMOD */ | 1317 | #endif /* CONFIG_KMOD */ |
1318 | 1318 | ||
1319 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 1319 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); |
1320 | if (! mix) | 1320 | if (! mix) |
1321 | return -ENOMEM; | 1321 | return -ENOMEM; |
1322 | memset(mix, 0, sizeof(*mix)); | ||
1323 | mix->headphone_irq = -1; | 1322 | mix->headphone_irq = -1; |
1324 | 1323 | ||
1325 | chip->mixer_data = mix; | 1324 | chip->mixer_data = mix; |