diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-07 15:37:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 09:59:23 -0700 |
| commit | 71d7e5b0dec5025cb9826cda458c8ad52537e910 (patch) | |
| tree | 85c045daafd19e3f7bd25786e6b68e7f889b7095 /sound/soc | |
| parent | c1281938088283ea813f9692b0fc692ab8decd83 (diff) | |
ASoC: omap-mcbsp: Fix 6pin mux configuration
commit d0db84e713eaaccea2a435e1625fb3150b335f4a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/omap/mcbsp.c | 2 |
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) { |