diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /sound/soc/codecs/ad1980.c | |
parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) |
Merge remote branch 'alsa/fixes' into fix/hda
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) | |||
257 | 257 | ||
258 | snd_soc_add_controls(codec, ad1980_snd_ac97_controls, | 258 | snd_soc_add_controls(codec, ad1980_snd_ac97_controls, |
259 | ARRAY_SIZE(ad1980_snd_ac97_controls)); | 259 | ARRAY_SIZE(ad1980_snd_ac97_controls)); |
260 | ret = snd_soc_init_card(socdev); | ||
261 | if (ret < 0) { | ||
262 | printk(KERN_ERR "ad1980: failed to register card\n"); | ||
263 | goto reset_err; | ||
264 | } | ||
265 | 260 | ||
266 | return 0; | 261 | return 0; |
267 | 262 | ||