From: Sebastian Reichel <sre@kernel.org>
To: Sebastian Reichel <sre@ring0.de>, Mark Brown <broonie@kernel.org>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Tony Lindgren <tony@atomide.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, alsa-devel@alsa-project.org,
Sebastian Reichel <sre@kernel.org>
Subject: [PATCHv2 7/9] ASoC: omap: rx51: Add some error messages
Date: Mon, 28 Apr 2014 16:07:25 +0200 [thread overview]
Message-ID: <1398694047-28596-8-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1398694047-28596-1-git-send-email-sre@kernel.org>
Add more error messages making it easier to identify problems.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
sound/soc/omap/rx51.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 30cfac0..110deca 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;
}
--
1.9.2
next prev parent reply other threads:[~2014-04-28 14:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-28 14:07 [PATCHv2 0/9] DT support for N900 soundcard (rx51-audio) Sebastian Reichel
2014-04-28 14:07 ` [PATCHv2 1/9] ASoC: omap: rx51: Use static const char * const arrays Sebastian Reichel
2014-04-29 22:22 ` Mark Brown
2014-04-28 14:07 ` [PATCHv2 2/9] ASoC: omap: rx51: Add module alias Sebastian Reichel
2014-04-29 22:22 ` Mark Brown
2014-04-28 14:07 ` [PATCHv2 3/9] ASoC: omap: rx51: Use devm_snd_soc_register_card Sebastian Reichel
2014-04-29 22:23 ` Mark Brown
2014-04-28 14:07 ` [PATCHv2 4/9] ASoC: Allow Aux Codecs to be specified using DT Sebastian Reichel
2014-05-01 17:57 ` Mark Brown
2014-04-28 14:07 ` [PATCHv2 5/9] ASoC: omap: rx51: omap_mcbsp_st_add_controls: add id parameter Sebastian Reichel
2014-05-01 17:54 ` Mark Brown
2014-06-30 10:02 ` Pavel Machek
2014-04-28 14:07 ` [PATCHv2 6/9] ASoC: omap: rx51: get GPIO numbers via gpiod API Sebastian Reichel
2014-05-01 17:55 ` Mark Brown
2014-06-30 10:02 ` Pavel Machek
2014-04-28 14:07 ` Sebastian Reichel [this message]
2014-05-01 17:55 ` [PATCHv2 7/9] ASoC: omap: rx51: Add some error messages Mark Brown
2014-06-30 10:02 ` Pavel Machek
2014-04-28 14:07 ` [PATCHv2 8/9] ASoC: omap: rx51: Add DT support Sebastian Reichel
2014-05-01 17:58 ` Mark Brown
2014-06-30 10:02 ` Pavel Machek
2014-04-28 14:07 ` [PATCHv2 9/9] DTS: OMAP3-N900: Add sound support Sebastian Reichel
2014-05-01 17:58 ` Mark Brown
2014-05-05 19:45 ` Tony Lindgren
2014-06-30 10:02 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398694047-28596-8-git-send-email-sre@kernel.org \
--to=sre@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=peter.ujfalusi@ti.com \
--cc=rob.herring@calxeda.com \
--cc=sre@ring0.de \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).