Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / sound / soc / pxa / zylonite.c

diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 2b8350b522329253d4d4fda27a7859f68861cc18..ceb656695b0fbc2f438779ac8331052063d83643 100644 (file)
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -87,7 +87,6 @@ static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_enable_pin(dapm, "Headphone");
        snd_soc_dapm_enable_pin(dapm, "Headset Earpiece");
 
-       snd_soc_dapm_sync(dapm);
        return 0;
 }
 
@@ -250,6 +249,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card)
 
 static struct snd_soc_card zylonite = {
        .name = "Zylonite",
+       .owner = THIS_MODULE,
        .probe = &zylonite_probe,
        .remove = &zylonite_remove,
        .suspend_post = &zylonite_suspend_post,