diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 17:09:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 17:09:11 +1000 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /sound/ppc/tumbler.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
| download | linux-3.10-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.gz linux-3.10-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.bz2 linux-3.10-32bc6e095d75233e7c87cc6fa0e07942b124d194.zip | |
Merge branch 'merge'
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 b94ecd0ebab..6ae2d5b9aa4 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1317,10 +1317,9 @@ int __init snd_pmac_tumbler_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)); mix->headphone_irq = -1; chip->mixer_data = mix; |