Skip to content

Commit

Permalink
ASoC: omap: rx51: Add some error messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Reichel authored and Mark Brown committed May 1, 2014
1 parent 386e81a commit 0265e1a
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions sound/soc/omap/rx51.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down

0 comments on commit 0265e1a

Please sign in to comment.