summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel2014-04-28 16:07:25 +0200
committerMark Brown2014-05-01 19:54:35 +0200
commit0265e1ae64ebf1bb55a563599d11fb7376478ae1 (patch)
treea16dbf66e59474434bccb87084223e887d82e969
parentASoC: omap: rx51: get GPIO numbers via gpiod API (diff)
downloadkernel-qcow2-linux-0265e1ae64ebf1bb55a563599d11fb7376478ae1.tar.gz
kernel-qcow2-linux-0265e1ae64ebf1bb55a563599d11fb7376478ae1.tar.xz
kernel-qcow2-linux-0265e1ae64ebf1bb55a563599d11fb7376478ae1.zip
ASoC: omap: rx51: Add some error messages
Add more error messages making it easier to identify problems. Signed-off-by: Sebastian Reichel <sre@kernel.org> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/omap/rx51.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 30cfac023138..110deca7fcbb 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -298,20 +298,26 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_nc_pin(dapm, "LINE1R");
err = tpa6130a2_add_controls(codec);
- if (err < 0)
+ if (err < 0) {
+ dev_err(card->dev, "Failed to add TPA6130A2 controls\n");
return err;
+ }
snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
err = omap_mcbsp_st_add_controls(rtd, 2);
- if (err < 0)
+ if (err < 0) {
+ dev_err(card->dev, "Failed to add MCBSP controls\n");
return err;
+ }
/* AV jack detection */
err = snd_soc_jack_new(codec, "AV Jack",
SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
&rx51_av_jack);
- if (err)
+ if (err) {
+ dev_err(card->dev, "Failed to add AV Jack\n");
return err;
+ }
/* prepare gpio for snd_soc_jack_add_gpios */
rx51_av_jack_gpios[0].gpio = desc_to_gpio(pdata->jack_detection_gpio);
@@ -320,6 +326,10 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
err = snd_soc_jack_add_gpios(&rx51_av_jack,
ARRAY_SIZE(rx51_av_jack_gpios),
rx51_av_jack_gpios);
+ if (err) {
+ dev_err(card->dev, "Failed to add GPIOs\n");
+ return err;
+ }
return err;
}