diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 23:13:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-03 23:14:43 +0100 |
| commit | fe3e78e073d25308756f38019956061153267769 (patch) | |
| tree | 6590150d5c67f8a5889f3d254fe82e5abf46f83a /sound/soc/codecs/uda134x.c | |
| parent | ASoC: Move sysfs and debugfs functions to head of soc-core.c (diff) | |
| download | linux-fe3e78e073d25308756f38019956061153267769.tar.xz linux-fe3e78e073d25308756f38019956061153267769.zip | |
ASoC: Factor out snd_soc_init_card()
snd_soc_init_card() is always called as the last part of the CODEC probe
function so we can factor it out into the core card setup rather than
have each CODEC replicate the code to do the initialiastation. This will
be required to support multiple CODECs per card.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
| -rw-r--r-- | sound/soc/codecs/uda134x.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index c33b92edbded..aa40d985138f 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c @@ -562,17 +562,8 @@ static int uda134x_soc_probe(struct platform_device *pdev) goto pcm_err; } - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "UDA134X: failed to register card\n"); - goto card_err; - } - return 0; -card_err: - snd_soc_free_pcms(socdev); - snd_soc_dapm_free(socdev); pcm_err: kfree(codec->reg_cache); reg_err: |