diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /sound/soc/codecs/tlv320aic3x.c | |
| parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
| parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
| download | linux-9ff561fdf73493d757bbc74aa58627e1381650fb.tar.bz2 | |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 64d2a4fa34b2..e9b62b5ea637 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -935,9 +935,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, } found: - data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); - snd_soc_write(codec, AIC3X_PLL_PROGA_REG, - data | (pll_p << PLLP_SHIFT)); + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG, PLLP_MASK, pll_p); snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, pll_r << PLLR_SHIFT); snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); |