| Message ID | 1455669967.6195.1.camel@ingics.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cffee535f0b09ab0801cbec01a8ae81595aa99bc |
| Headers | show |
Looks good to me. Thanks. Acked-by: anish kumar<yesanishhere@gmail.com> On Tue, Feb 16, 2016 at 4:46 PM, Axel Lin <axel.lin@ingics.com> wrote: > Current code calculates blr_clk_ratio before setting max98926->ch_size, fix > it. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > Hi Anish, > I don't have this h/w, please review and test this patch. > > thanks, > Axel > > sound/soc/codecs/max98926.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c > index 66884ebd..5245e10 100644 > --- a/sound/soc/codecs/max98926.c > +++ b/sound/soc/codecs/max98926.c > @@ -383,8 +383,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, > int rate = params_rate(params), i; > struct snd_soc_codec *codec = dai->codec; > struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec); > - /* BCLK/LRCLK ratio calculation */ > - int blr_clk_ratio = params_channels(params) * max98926->ch_size; > + int blr_clk_ratio; > > switch (params_format(params)) { > case SNDRV_PCM_FORMAT_S16_LE: > @@ -414,6 +413,9 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, > return -EINVAL; > } > > + /* BCLK/LRCLK ratio calculation */ > + blr_clk_ratio = params_channels(params) * max98926->ch_size; > + > switch (blr_clk_ratio) { > case 32: > regmap_update_bits(max98926->regmap, > -- > 2.1.4 > > >
diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index 66884ebd..5245e10 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -383,8 +383,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, int rate = params_rate(params), i; struct snd_soc_codec *codec = dai->codec; struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec); - /* BCLK/LRCLK ratio calculation */ - int blr_clk_ratio = params_channels(params) * max98926->ch_size; + int blr_clk_ratio; switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: @@ -414,6 +413,9 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* BCLK/LRCLK ratio calculation */ + blr_clk_ratio = params_channels(params) * max98926->ch_size; + switch (blr_clk_ratio) { case 32: regmap_update_bits(max98926->regmap,
Current code calculates blr_clk_ratio before setting max98926->ch_size, fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- Hi Anish, I don't have this h/w, please review and test this patch. thanks, Axel sound/soc/codecs/max98926.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)