diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
| commit | 3146089d235b304e665dc551472ae9cb9ab58572 (patch) | |
| tree | d1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/codecs/mt6351.c | |
| parent | b5e806ae4ad81de66c334d3d333fa42f960fbbd1 (diff) | |
| parent | 7b6b0049e2b70d103adf1b7d0320802f70ddceca (diff) | |
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/codecs/mt6351.c')
| -rw-r--r-- | sound/soc/codecs/mt6351.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/mt6351.c b/sound/soc/codecs/mt6351.c index f73dcd753584..4b3ce01c5a93 100644 --- a/sound/soc/codecs/mt6351.c +++ b/sound/soc/codecs/mt6351.c @@ -1415,8 +1415,6 @@ static const struct snd_soc_dapm_route mt6351_dapm_routes[] = { static int mt6351_codec_init_reg(struct snd_soc_component *cmpnt) { - int ret = 0; - /* Disable CLKSQ 26MHz */ regmap_update_bits(cmpnt->regmap, MT6351_TOP_CLKSQ, 0x0001, 0x0); /* disable AUDGLB */ @@ -1434,7 +1432,7 @@ static int mt6351_codec_init_reg(struct snd_soc_component *cmpnt) /* Reverse the PMIC clock*/ regmap_update_bits(cmpnt->regmap, MT6351_AFE_PMIC_NEWIF_CFG2, 0x8000, 0x8000); - return ret; + return 0; } static int mt6351_codec_probe(struct snd_soc_component *cmpnt) |