summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8350.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-12-13 12:55:39 +0100
committerTakashi Iwai <tiwai@suse.de>2010-12-13 12:58:59 +0100
commitfdea0571ddca8e3f22448f66d72a034575abea28 (patch)
treee16a5a57e667eb9b3f442ac6dd4509a0c20b57d8 /sound/soc/codecs/wm8350.c
parent20aeeb356ba2e8daa99b5942c528ae2b3ea28433 (diff)
downloadblackbird-op-linux-fdea0571ddca8e3f22448f66d72a034575abea28.tar.gz
blackbird-op-linux-fdea0571ddca8e3f22448f66d72a034575abea28.zip
ASoC: Fix merge errors with flush_scheduled_work() removal
delayed_work was moved to dapm in the commit ce6120cca2589ede530200c7cfe11ac9f144333c ASoC: Decouple DAPM from CODECs Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r--sound/soc/codecs/wm8350.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index f8a8a6944e65..07ba7e3f6a8c 100644
--- 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);
OpenPOWER on IntegriCloud