diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:41 +0100 |
| commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
| tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /sound/soc/codecs/uda134x.c | |
| parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
| parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) | |
| download | talos-op-linux-baf9226667734579e344f612ed39f727079cad51.tar.gz talos-op-linux-baf9226667734579e344f612ed39f727079cad51.zip | |
Merge branch 'topic/asoc' into for-linus
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: |
