summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-08-07 15:37:47 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-07 15:04:02 +0100
commitd0db84e713eaaccea2a435e1625fb3150b335f4a (patch)
tree74f89a68422dfb8d3651e4c3a2f1fde958a781c6
parent3c6c2a997743c48c3ef8abbf3400c4cf6da650fe (diff)
downloadlinux-d0db84e713eaaccea2a435e1625fb3150b335f4a.tar.gz
linux-d0db84e713eaaccea2a435e1625fb3150b335f4a.tar.bz2
linux-d0db84e713eaaccea2a435e1625fb3150b335f4a.zip
ASoC: omap-mcbsp: Fix 6pin mux configuration
The check for the mux_signal callback was wrong which prevents us to configure the 6pin port's FSR/CLKR signal mux. Reported-by: CF Adad <cfadad@rocketmail.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org (3.4+)
-rw-r--r--sound/soc/omap/mcbsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 34835e8a9160..d33c48baaf71 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -745,7 +745,7 @@ int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
{
const char *signal, *src;
- if (mcbsp->pdata->mux_signal)
+ if (!mcbsp->pdata->mux_signal)
return -EINVAL;
switch (mux) {