aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeng Zhaoming <b32542@freescale.com>2011-04-21 08:06:29 +0800
committerRichard Zhao <richard.zhao@freescale.com>2011-04-21 17:35:54 +0800
commit4342021c12262d9d309f4ffb7db1eae61be2bb20 (patch)
tree240cf819404a9fdfdbbbbbd677b5b42518a8f093
parentcf8b57342b6a647200c2d5f47dff22546476f5c5 (diff)
downloadlinux-linaro-natty-4342021c12262d9d309f4ffb7db1eae61be2bb20.tar.gz
ENGR00142436-2 SGTL5000: Audio not work in 2.6.38 kernel
If platform not provide headphone status detect gpio, should not failed the audio subsystem. Fix it by complains with a warning. Signed-off-by: Zeng Zhaoming <b32542@freescale.com> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
-rw-r--r--sound/soc/imx/imx-sgtl5000.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c
index 4da55ad781bf..82ee8eca8680 100644
--- a/sound/soc/imx/imx-sgtl5000.c
+++ b/sound/soc/imx/imx-sgtl5000.c
@@ -264,10 +264,8 @@ static int imx_3stack_sgtl5000_init(struct snd_soc_pcm_runtime *rtd)
ret = snd_soc_jack_add_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios),
hs_jack_gpios);
- if (ret) {
- printk(KERN_ERR "failed to call snd_soc_jack_add_gpios\n");
- return ret;
- }
+ if (ret)
+ printk(KERN_WARNING "failed to call snd_soc_jack_add_gpios\n");
return 0;
}