diff options
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/mcbsp.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 1 |
3 files changed, 3 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) | |||
745 | { | 745 | { |
746 | const char *signal, *src; | 746 | const char *signal, *src; |
747 | 747 | ||
748 | if (mcbsp->pdata->mux_signal) | 748 | if (!mcbsp->pdata->mux_signal) |
749 | return -EINVAL; | 749 | return -EINVAL; |
750 | 750 | ||
751 | switch (mux) { | 751 | switch (mux) { |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 1046083e90a0..acdd3ef14e08 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -820,3 +820,4 @@ module_platform_driver(asoc_mcbsp_driver); | |||
820 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); | 820 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); |
821 | MODULE_DESCRIPTION("OMAP I2S SoC Interface"); | 821 | MODULE_DESCRIPTION("OMAP I2S SoC Interface"); |
822 | MODULE_LICENSE("GPL"); | 822 | MODULE_LICENSE("GPL"); |
823 | MODULE_ALIAS("platform:omap-mcbsp"); | ||
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 5a649da9122a..f0feb06615f8 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -441,3 +441,4 @@ module_platform_driver(omap_pcm_driver); | |||
441 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); | 441 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); |
442 | MODULE_DESCRIPTION("OMAP PCM DMA module"); | 442 | MODULE_DESCRIPTION("OMAP PCM DMA module"); |
443 | MODULE_LICENSE("GPL"); | 443 | MODULE_LICENSE("GPL"); |
444 | MODULE_ALIAS("platform:omap-pcm-audio"); | ||