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/stac9766.c | |
| parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
| parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) | |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'sound/soc/codecs/stac9766.c')
| -rw-r--r-- | sound/soc/codecs/stac9766.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index befc6488c39a..bbc72c2ddfca 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c | |||
| @@ -418,9 +418,6 @@ static int stac9766_codec_probe(struct platform_device *pdev) | |||
| 418 | snd_soc_add_controls(codec, stac9766_snd_ac97_controls, | 418 | snd_soc_add_controls(codec, stac9766_snd_ac97_controls, |
| 419 | ARRAY_SIZE(stac9766_snd_ac97_controls)); | 419 | ARRAY_SIZE(stac9766_snd_ac97_controls)); |
| 420 | 420 | ||
| 421 | ret = snd_soc_init_card(socdev); | ||
| 422 | if (ret < 0) | ||
| 423 | goto reset_err; | ||
| 424 | return 0; | 421 | return 0; |
| 425 | 422 | ||
| 426 | reset_err: | 423 | reset_err: |