summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 13:54:26 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 13:54:26 +0000
commitc8980d2c17e40767c0971e0200c645c198a96fe3 (patch)
tree4d9ccdd6372303ea26c17d0f70c841a20be652b3 /sound
parentd672e98b9b718d66e41e6e11ae2668a04a87c3c5 (diff)
parent24338722cfa23fdf4e08c6189a11f7e3a902d86a (diff)
downloadlinux-c8980d2c17e40767c0971e0200c645c198a96fe3.tar.bz2
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm5110.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index c04c0bc6f58a..52b9ccf6d389 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -360,15 +360,13 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w,
static int wm5110_clear_pga_volume(struct arizona *arizona, int output)
{
- struct reg_sequence clear_pga = {
- ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80
- };
+ unsigned int reg = ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4;
int ret;
- ret = regmap_multi_reg_write_bypassed(arizona->regmap, &clear_pga, 1);
+ ret = regmap_write(arizona->regmap, reg, 0x80);
if (ret)
dev_err(arizona->dev, "Failed to clear PGA (0x%x): %d\n",
- clear_pga.reg, ret);
+ reg, ret);
return ret;
}