linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 57202b0..b96cd94 100644 (file)
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -22,6 +22,7 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
+#include <linux/i2c-dev.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -258,9 +259,10 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
                request_module("i2c-powermac");
 #endif /* CONFIG_KMOD */       
 
-       mix = kzalloc(sizeof(*mix), GFP_KERNEL);
+       mix = kmalloc(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 */