diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-15 12:57:42 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-15 12:57:42 +0900 |
| commit | 2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch) | |
| tree | 2eb2819e880060486d36665113e8da5c460383fc /sound/soc/codecs/wm8753.c | |
| parent | 6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff) | |
| parent | 8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff) | |
| download | talos-obmc-linux-2570a3719cd748899d9e9e8407eb0d9027df2a94.tar.gz talos-obmc-linux-2570a3719cd748899d9e9e8407eb0d9027df2a94.zip | |
Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm2200
regmap: Range API changes
A bunch of updates to the regmap range support, the most important ones
being to rename "n_ranges" to "num_ranges" for consistency and to allow
block writes to cross page boundaries, making things more transparent.
Diffstat (limited to 'sound/soc/codecs/wm8753.c')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 13bff87ddcf5..2e4a775ae560 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1509,7 +1509,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->dapm.delayed_work); + flush_delayed_work(&codec->dapm.delayed_work); wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); return 0; |
