diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 18:29:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 18:29:39 +0200 |
| commit | 84b37df4198f8e68a731f1d7daac3465cbbea241 (patch) | |
| tree | 59356686a77af1d39514c9868cfb2e34fb502605 /sound/soc/codecs/wm8988.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | ASoC: Select wm_hubs automatically for WM8994 (diff) | |
| download | linux-84b37df4198f8e68a731f1d7daac3465cbbea241.tar.xz linux-84b37df4198f8e68a731f1d7daac3465cbbea241.zip | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Select wm_hubs automatically for WM8994
ASoC: Remove duplicate AUX definition from WM8776
ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
ASoC: wm8727: add a missing return in wm8727_platform_probe
ASoC: fsi: fixup wrong value setting order of TDM
ASoC: fsi: fixup clock inversion operation
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
| -rw-r--r-- | sound/soc/codecs/wm8988.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 0417dae32e6f..19ad590ca0b3 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -885,7 +885,6 @@ static int wm8988_register(struct wm8988_priv *wm8988, ret = snd_soc_register_dai(&wm8988_dai); if (ret != 0) { dev_err(codec->dev, "Failed to register DAI: %d\n", ret); - snd_soc_unregister_codec(codec); goto err_codec; } |