From e35115a58856ced315cb8f75df56e9b9a816e70a Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Wed, 31 Jan 2007 10:02:23 +0100 Subject: [ALSA] ASoC codec error reporting This patch improves the codec probe() error reporting by printing error messages when the card or pcms fail to register. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/soc/codecs/wm8731.c | 15 +++++++++++---- sound/soc/codecs/wm8750.c | 14 ++++++++++---- sound/soc/codecs/wm9712.c | 22 +++++++++++++--------- 3 files changed, 34 insertions(+), 17 deletions(-) (limited to 'sound') diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 8151b45a280c..9956d654b6f3 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -696,8 +696,8 @@ static int wm8731_init(struct snd_soc_device *socdev) /* register pcms */ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); if (ret < 0) { - kfree(codec->reg_cache); - return ret; + printk(KERN_ERR "wm8731: failed to create pcms\n"); + goto pcm_err; } /* power on device */ @@ -717,11 +717,18 @@ static int wm8731_init(struct snd_soc_device *socdev) wm8731_add_widgets(codec); ret = snd_soc_register_card(socdev); if (ret < 0) { - snd_soc_free_pcms(socdev); - snd_soc_dapm_free(socdev); + printk(KERN_ERR "wm8731: failed to register card\n"); + goto card_err; } return ret; + +card_err: + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); +pcm_err: + kfree(codec->reg_cache); + return ret; } static struct snd_soc_device *wm8731_socdev; diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index e7f04b89c8a0..d4a288ba644b 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -1075,8 +1075,8 @@ static int wm8750_init(struct snd_soc_device *socdev) /* register pcms */ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); if (ret < 0) { - kfree(codec->reg_cache); - return ret; + printk(KERN_ERR "wm8750: failed to create pcms\n"); + goto pcm_err; } /* charge output caps */ @@ -1106,10 +1106,16 @@ static int wm8750_init(struct snd_soc_device *socdev) wm8750_add_widgets(codec); ret = snd_soc_register_card(socdev); if (ret < 0) { - snd_soc_free_pcms(socdev); - snd_soc_dapm_free(socdev); + printk(KERN_ERR "wm8750: failed to register card\n"); + goto card_err; } + return ret; +card_err: + snd_soc_free_pcms(socdev); + snd_soc_dapm_free(socdev); +pcm_err: + kfree(codec->reg_cache); return ret; } diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 36c6a38a0f94..b2d2d03b9544 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -692,10 +692,8 @@ static int wm9712_soc_probe(struct platform_device *pdev) codec->reg_cache = kzalloc(sizeof(u16) * ARRAY_SIZE(wm9712_reg), GFP_KERNEL); if (codec->reg_cache == NULL) { - kfree(codec->ac97); - kfree(socdev->codec); - socdev->codec = NULL; - return -ENOMEM; + ret = -ENOMEM; + goto cache_err; } memcpy(codec->reg_cache, wm9712_reg, sizeof(u16) * ARRAY_SIZE(wm9712_reg)); codec->reg_cache_size = sizeof(u16) * ARRAY_SIZE(wm9712_reg); @@ -712,8 +710,10 @@ static int wm9712_soc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&codec->dapm_paths); ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); - if (ret < 0) - goto err; + if (ret < 0) { + printk(KERN_ERR "wm9712: failed to register AC97 codec\n"); + goto codec_err; + } /* register pcms */ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); @@ -733,8 +733,10 @@ static int wm9712_soc_probe(struct platform_device *pdev) wm9712_add_controls(codec); wm9712_add_widgets(codec); ret = snd_soc_register_card(socdev); - if (ret < 0) + if (ret < 0) { + printk(KERN_ERR "wm9712: failed to register card\n"); goto reset_err; + } return 0; @@ -744,8 +746,10 @@ reset_err: pcm_err: snd_soc_free_ac97_codec(codec); -err: - kfree(socdev->codec->reg_cache); +codec_err: + kfree(codec->reg_cache); + +cache_err: kfree(socdev->codec); socdev->codec = NULL; return ret; -- cgit v1.2.2