aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorZeng Zhaoming <b32542@freescale.com>2011-04-21 08:06:29 +0800
committerZeng Zhaoming <b32542@freescale.com>2011-04-21 08:06:29 +0800
commit9cf98d0b6b340e7858510b9cc73289f1b6a72f90 (patch)
tree5cef6a9fcbed298d70149b6ad8c97c95d41924a6 /sound
parent9fcdc257e7db880b1f053399ddf6da5dfa9e4863 (diff)
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>
Diffstat (limited to 'sound')
-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 4da55ad781b..82ee8eca868 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;
}