]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: wm8994: Allow rate configuration with custom mic callback
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 26 Apr 2012 15:35:46 +0000 (16:35 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 26 Apr 2012 17:08:45 +0000 (18:08 +0100)
If a driver using a custom mic detection callback has provided a table
of mic detection rates via platform data then use it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8994.c

index e10d46a568155777699c10e65cc23815abaaa507..ca6d822eb112dd4009f029a4a5e7823e4d993ef5 100644 (file)
@@ -82,7 +82,8 @@ static void wm8958_micd_set_rate(struct snd_soc_codec *codec)
        const struct wm8958_micd_rate *rates;
        int num_rates;
 
-       if (wm8994->jack_cb != wm8958_default_micdet)
+       if (!(wm8994->pdata && wm8994->pdata->micd_rates) &&
+           wm8994->jack_cb != wm8958_default_micdet)
                return;
 
        idle = !wm8994->jack_mic;