git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
ppc
/
daca.c
diff --git
a/sound/ppc/daca.c
b/sound/ppc/daca.c
index
b96cd94
..
57202b0
100644
(file)
--- a/
sound/ppc/daca.c
+++ b/
sound/ppc/daca.c
@@
-22,7
+22,6
@@
#include <sound/driver.h>
#include <linux/init.h>
#include <linux/i2c.h>
#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>
#include <linux/kmod.h>
#include <linux/slab.h>
#include <sound/core.h>
@@
-259,10
+258,9
@@
int __init snd_pmac_daca_init(struct snd_pmac *chip)
request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
- mix = k
m
alloc(sizeof(*mix), GFP_KERNEL);
+ mix = k
z
alloc(sizeof(*mix), GFP_KERNEL);
if (! mix)
return -ENOMEM;
if (! mix)
return -ENOMEM;
- memset(mix, 0, sizeof(*mix));
chip->mixer_data = mix;
chip->mixer_free = daca_cleanup;
mix->amp_on = 1; /* default on */
chip->mixer_data = mix;
chip->mixer_free = daca_cleanup;
mix->amp_on = 1; /* default on */