diff --git a/[refs] b/[refs] index 8abb22ebd490..22887a1b51e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 570aa7bae5e72900d62915fc56783689d95c3fb3 +refs/heads/master: c4b14e70a1e59caff00d8336430704376b4211ed diff --git a/trunk/sound/soc/codecs/da7210.c b/trunk/sound/soc/codecs/da7210.c index 65e666e630d7..f92d1f777757 100644 --- a/trunk/sound/soc/codecs/da7210.c +++ b/trunk/sound/soc/codecs/da7210.c @@ -992,19 +992,15 @@ static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, /* Search pll div array for correct divisors */ for (cnt = 0; cnt < ARRAY_SIZE(da7210_pll_div); cnt++) { - /* check fref */ - if (fref == da7210_pll_div[cnt].fref) { - /* check mode */ - if (da7210->master == da7210_pll_div[cnt].mode) { - /* check fout */ - if (fout == da7210_pll_div[cnt].fout) { - /* all match, pick up divisors */ - pll_div1 = da7210_pll_div[cnt].div1; - pll_div2 = da7210_pll_div[cnt].div2; - pll_div3 = da7210_pll_div[cnt].div3; - break; - } - } + /* check fref, mode and fout */ + if ((fref == da7210_pll_div[cnt].fref) && + (da7210->master == da7210_pll_div[cnt].mode) && + (fout == da7210_pll_div[cnt].fout)) { + /* all match, pick up divisors */ + pll_div1 = da7210_pll_div[cnt].div1; + pll_div2 = da7210_pll_div[cnt].div2; + pll_div3 = da7210_pll_div[cnt].div3; + break; } } if (cnt >= ARRAY_SIZE(da7210_pll_div))