diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:43:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:43:17 -0400 |
| commit | 38ebb1e0ed214efe124534eba4a34e869a0d8da7 (patch) | |
| tree | 3712611527654e81109d194d903401c86763e3f4 /sound/ppc/tumbler.c | |
| parent | 236a686b56428a8967a057a2396f9be74e2ee652 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' into upstream
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; |