aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/mcbsp.c2
-rw-r--r--sound/soc/omap/omap-mcbsp.c1
-rw-r--r--sound/soc/omap/omap-pcm.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 6afbc26cef70..935ccf633976 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -766,7 +766,7 @@ int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux)
766{ 766{
767 const char *signal, *src; 767 const char *signal, *src;
768 768
769 if (mcbsp->pdata->mux_signal) 769 if (!mcbsp->pdata->mux_signal)
770 return -EINVAL; 770 return -EINVAL;
771 771
772 switch (mux) { 772 switch (mux) {
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 9dff177cd4e2..2e91a86b6114 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -850,3 +850,4 @@ module_platform_driver(asoc_mcbsp_driver);
850MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); 850MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");
851MODULE_DESCRIPTION("OMAP I2S SoC Interface"); 851MODULE_DESCRIPTION("OMAP I2S SoC Interface");
852MODULE_LICENSE("GPL"); 852MODULE_LICENSE("GPL");
853MODULE_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);
441MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>"); 441MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");
442MODULE_DESCRIPTION("OMAP PCM DMA module"); 442MODULE_DESCRIPTION("OMAP PCM DMA module");
443MODULE_LICENSE("GPL"); 443MODULE_LICENSE("GPL");
444MODULE_ALIAS("platform:omap-pcm-audio");