diff mbox

[PATCHv2,7/9] ASoC: omap: rx51: Add some error messages

Message ID 1398694047-28596-8-git-send-email-sre@kernel.org (mailing list archive)
State Accepted
Commit 0265e1ae64ebf1bb55a563599d11fb7376478ae1
Headers show

Commit Message

Sebastian Reichel April 28, 2014, 2:07 p.m. UTC 
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(-)

Comments

Mark Brown May 1, 2014, 5:55 p.m. UTC | #1 
On Mon, Apr 28, 2014 at 04:07:25PM +0200, Sebastian Reichel wrote:
> Add more error messages making it easier to identify problems.

Applied, thanks.
Pavel Machek June 30, 2014, 10:02 a.m. UTC | #2 
Hi!

> 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(-)

> +	if (err) {
> +		dev_err(card->dev, "Failed to add GPIOs\n");
> +		return err;
> +	}
>  
>  	return err;
>  }


As you'll return err, anyway, you don't need to do it inside the if()... OTOH it 
does not hurt.

Acked-by: Pavel Machek <pavel@ucw.cz>
diff mbox

Patch

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;
 }