From 45efa4b6d69ff418c5ecae7fc5340fa2ab4bc3a1 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 31 Jul 2012 15:45:41 +0100 Subject: [PATCH] --- yaml --- r: 321361 b: refs/heads/master c: 58f598ff0bb0c030e026a0738450c6a46248f6a8 h: refs/heads/master i: 321359: b020130bab895314dc8a727ec80bbdae7e7d6f54 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ab8500-codec.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e70ab658cabc..f19a867464a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e70b7fc38a4659540ea5f56f7a1a7da20f4554d +refs/heads/master: 58f598ff0bb0c030e026a0738450c6a46248f6a8 diff --git a/trunk/sound/soc/codecs/ab8500-codec.c b/trunk/sound/soc/codecs/ab8500-codec.c index 3c795921c5f6..23b40186f9b8 100644 --- a/trunk/sound/soc/codecs/ab8500-codec.c +++ b/trunk/sound/soc/codecs/ab8500-codec.c @@ -2406,6 +2406,10 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) /* Setup AB8500 according to board-settings */ pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent); + + /* Inform SoC Core that we have our own I/O arrangements. */ + codec->control_data = (void *)true; + status = ab8500_audio_setup_mics(codec, &pdata->codec->amics); if (status < 0) { pr_err("%s: Failed to setup mics (%d)!\n", __func__, status);