projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20aeeb3)
ASoC: Fix merge errors with flush_scheduled_work() removal
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:55:39 +0000 (12:55 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:58:59 +0000 (12:58 +0100)
delayed_work was moved to dapm in the commit
ce6120cca2589ede530200c7cfe11ac9f144333c
    ASoC: Decouple DAPM from CODECs

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/codecs/wm8350.c patch | blob | blame | history
sound/soc/codecs/wm8753.c patch | blob | blame | history

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index f8a8a6944e652b3a2f74b6edebfadb7afe697e50..07ba7e3f6a8ce2b25dd632244e5aa5832bfccf0c 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1643,7 +1643,7 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
 
        /* if there was any work waiting then we run it now and
         * wait for its completion */
-       flush_delayed_work_sync(&codec->delayed_work);
+       flush_delayed_work_sync(&codec->dapm.delayed_work);
 
        wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 747457193887a60d1f4bab342c30de8c15e0ed61..73507e71cb79a090e4f9a65ae29dbda84dcc2190 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1587,7 +1587,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
 /* power down chip */
 static int wm8753_remove(struct snd_soc_codec *codec)
 {
-       flush_delayed_work_sync(&codec->delayed_work);
+       flush_delayed_work_sync(&codec->dapm.delayed_work);
        wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
        return 0;