From 811d500d14db87326311d20868d3d593b6296a28 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 4 Nov 2009 11:13:15 +0100 Subject: neo1973_wm8753: Sanity check: Don't try to write registers if amp i2c device is not registered. --- sound/soc/s3c24xx/neo1973_wm8753.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 7f28af2058e..262db4651b4 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"); } -- cgit v1.2.3 From 58475199e7a40febf2563533fc424c9b0cff4fac Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 4 Nov 2009 21:46:15 +0100 Subject: neo1973_wm8753: Fix typo --- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 262db4651b4..d3f87fb8a91 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -513,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 */ -- cgit v1.2.3 From 5e9322c51ad527d3f6456f1eca2a52c2c9c3cc79 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 4 Nov 2009 21:47:54 +0100 Subject: neo1973_wm8753: Set card name to neo1973gta02 if its a gta02 --- sound/soc/s3c24xx/neo1973_wm8753.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index d3f87fb8a91..5cc1ef2c8fe 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -679,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) -- cgit v1.2.3