linux-next: build failure after merge of the sound-asoc tree

linux-next: build failure after merge of the sound-asoc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/codecs/ad1836.c:130:2: error: 'AD183X_ADC_CTRL1' undeclared here (not in a function)

Caused by commit f97d0c6d5f94 ("ASoC: AD1836: Add input gain control for
ADC2").

I have used the sound-asoc tree from next-20110606 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

[PATCH] ASoC: AD1836: Fix build error

[Lars-Peter Clausen]

Commit f97d0c6d5f94 ("ASoC: AD1836: Add input gain control for ADC2") contained
a typo in the register name, causing a build error. This patch fixes it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

---
 sound/soc/codecs/ad1836.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 1e9a801..e3a9493 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -127,7 +127,7 @@ static const struct snd_soc_dapm_route ad183x_dapm_routes[] = {
 static const DECLARE_TLV_DB_SCALE(ad1836_in_tlv, 0, 300, 0);
 
 static const struct snd_kcontrol_new ad1836_controls[] = {
-	SOC_DOUBLE_TLV("ADC2 Capture Volume", AD183X_ADC_CTRL1, 3, 0, 4, 0,
+	SOC_DOUBLE_TLV("ADC2 Capture Volume", AD1836_ADC_CTRL1, 3, 0, 4, 0,
 	    ad1836_in_tlv),
 };
 
-- 
1.7.2.5

Re: [PATCH] ASoC: AD1836: Fix build error

[Liam Girdwood]

On 07/06/11 06:02, Lars-Peter Clausen wrote:
> Commit f97d0c6d5f94 ("ASoC: AD1836: Add input gain control for ADC2") contained
> a typo in the register name, causing a build error. This patch fixes it.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> 

Acked-by: Liam Girdwood <lrg@ti.com>

Re: [PATCH] ASoC: AD1836: Fix build error

[Mark Brown]

On Tue, Jun 07, 2011 at 07:02:59AM +0200, Lars-Peter Clausen wrote:
> Commit f97d0c6d5f94 ("ASoC: AD1836: Add input gain control for ADC2") contained
> a typo in the register name, causing a build error. This patch fixes it.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>

Applied, thanks.