Merge git://git.linux-xtensa.org/kernel/xtensa-feed

[linux-2.6-omap-h63xx.git] / sound / ppc / daca.c

diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 46eebf5610e39386cd3fc72eb40ccba456380d80..57202b0f033ecf977e121bf732a1834c17f6f5dd 100644 (file)
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -258,10 +258,9 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
                request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */       
 
-       mix = kmalloc(sizeof(*mix), GFP_KERNEL);
+       mix = kzalloc(sizeof(*mix), GFP_KERNEL);
        if (! mix)
                return -ENOMEM;
-       memset(mix, 0, sizeof(*mix));
        chip->mixer_data = mix;
        chip->mixer_free = daca_cleanup;
        mix->amp_on = 1; /* default on */