From: Mark Brown <broonie@kernel.org>
Date: Mon, 6 Oct 2014 11:49:02 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc... 
X-Git-Tag: firefly_0821_release~176^2~2610^2~90^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9568eaec6c16f909e806a3920699376ec147d8fa;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc/topic/rsnd' and 'asoc/topic/rt286' into asoc-next
---

9568eaec6c16f909e806a3920699376ec147d8fa
diff --cc sound/soc/codecs/max98090.c
index 7e111865946a,f2a3f30a5d9f,4a063fa88526,4a063fa88526,4a063fa88526..d519294f57c7
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@@@ -2414,9 -2406,10 -2310,6 -2310,6 -2310,6 +2406,10 @@@@@@ static int max98090_remove(struct snd_s
     	struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);
     
     	cancel_delayed_work_sync(&max98090->jack_work);
  +++	cancel_delayed_work_sync(&max98090->pll_det_enable_work);
  +++	cancel_work_sync(&max98090->pll_det_disable_work);
  +++	cancel_work_sync(&max98090->pll_work);
+ +++	max98090->codec = NULL;
     
     	return 0;
     }