aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-11-04 21:49:01 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-11-04 21:49:01 +0100
commit7b546acc9582e8fe5bedfc088edb119398d82b03 (patch)
tree154ca8f54b3615920f572d4028bcb5fa6d637e3d /sound
parentd04be3b0ed8dfb21a3eeae41522cc135a709f93b (diff)
parent5e9322c51ad527d3f6456f1eca2a52c2c9c3cc79 (diff)
Merge branch 'wm8753-2.6.31' into om-gta02-2.6.31
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/s3c24xx/neo1973_wm8753.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 7f28af2058e..5cc1ef2c8fe 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -50,6 +50,9 @@ static struct lm4857 {
static void lm4857_write_regs(void)
{
+ if (!lm4857.i2c)
+ return;
+
if (i2c_master_send(lm4857.i2c, lm4857.regs, 4) != 4)
printk(KERN_ERR "lm4857: i2c write failed\n");
}
@@ -510,8 +513,8 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
machine_widgets = wm8753_dapm_widgets_gta02;
num_machine_widgets = ARRAY_SIZE(wm8753_dapm_widgets_gta02);
- machine_controls = wm8753_neo1973_gta01_controls;
- num_machine_controls = ARRAY_SIZE(wm8753_neo1973_gta01_controls);
+ machine_controls = wm8753_neo1973_gta02_controls;
+ num_machine_controls = ARRAY_SIZE(wm8753_neo1973_gta02_controls);
}
/* set up NC codec pins */
@@ -676,6 +679,10 @@ static int __init neo1973_init(void)
return -ENODEV;
}
+ if (machine_is_neo1973_gta02()) {
+ neo1973_snd_devdata.card->name = "neo1973gta02";
+ }
+
/* register bluetooth DAI here */
ret = snd_soc_register_dai(&bt_dai);
if (ret)