diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2007-01-31 10:02:23 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 09:03:22 +0100 |
| commit | e35115a58856ced315cb8f75df56e9b9a816e70a (patch) | |
| tree | 7aa86aba3c4ed36271ca46d82bf98481a84f901f /sound/soc/codecs/wm8731.c | |
| parent | 877b866d86786ac69d3d939905999fe7fe1e23fd (diff) | |
| download | op-kernel-dev-e35115a58856ced315cb8f75df56e9b9a816e70a.zip op-kernel-dev-e35115a58856ced315cb8f75df56e9b9a816e70a.tar.gz | |
[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 <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 8151b45..9956d65 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; |
