diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 18:22:41 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 18:22:41 +0300 |
| commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
| tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /sound/soc/codecs/ad73311.c | |
| parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
| parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) | |
| download | linux-baf9226667734579e344f612ed39f727079cad51.tar.xz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/ad73311.c')
| -rw-r--r-- | sound/soc/codecs/ad73311.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index e61dac5e7b8f..d2fcc601722c 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c @@ -64,16 +64,8 @@ static int ad73311_soc_probe(struct platform_device *pdev) goto pcm_err; } - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "ad73311: failed to register card\n"); - goto register_err; - } - return ret; -register_err: - snd_soc_free_pcms(socdev); pcm_err: kfree(socdev->card->codec); socdev->card->codec = NULL; |