X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound%2Fppc%2Fdaca.c;h=57202b0f033ecf977e121bf732a1834c17f6f5dd;hb=946b92437e550d6ed80213bf54a1f383e141aede;hp=aa09ebd9ffb8cfe9aed528a5e8f8d315bd9097a7;hpb=88f07ffb63add018bfafd480ec6a294088277f06;p=linux-2.6

diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index aa09ebd9ff..57202b0f03 100644
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -255,13 +255,12 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
 
 #ifdef CONFIG_KMOD
 	if (current->fs->root)
-		request_module("i2c-keywest");
+		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 */