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/ad1980.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/ad1980.c')
| -rw-r--r-- | sound/soc/codecs/ad1980.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index d7440a982d22..39c0f7584e65 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -257,11 +257,6 @@ static int ad1980_soc_probe(struct platform_device *pdev) snd_soc_add_controls(codec, ad1980_snd_ac97_controls, ARRAY_SIZE(ad1980_snd_ac97_controls)); - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "ad1980: failed to register card\n"); - goto reset_err; - } return 0; |