leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2016-01-11 13:54:26 +00:00
commit c8980d2c17
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/wm5110.c
View File

@ -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) static int wm5110_clear_pga_volume(struct arizona *arizona, int output)
{ {
struct reg_sequence clear_pga = { unsigned int reg = ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4;
ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80
};
int ret; int ret;
ret = regmap_multi_reg_write_bypassed(arizona->regmap, &clear_pga, 1); ret = regmap_write(arizona->regmap, reg, 0x80);
if (ret) if (ret)
dev_err(arizona->dev, "Failed to clear PGA (0x%x): %d\n", dev_err(arizona->dev, "Failed to clear PGA (0x%x): %d\n",
clear_pga.reg, ret); reg, ret);
return ret; return ret;
} }