diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /sound/ppc/tumbler.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
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; |