Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7 Conflicts): drivers/base/regmap/regmap.c (overlap with bug fixes) sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
This commit is contained in:
@@ -941,6 +941,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
|
||||
|
||||
/* MCLKX -> MCLK */
|
||||
mclkx_coeff = cs42l73_get_mclkx_coeff(freq);
|
||||
if (mclkx_coeff < 0)
|
||||
return mclkx_coeff;
|
||||
|
||||
mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx /
|
||||
cs42l73_mclkx_coeffs[mclkx_coeff].ratio;
|
||||
|
Fai riferimento in un nuovo problema
Block a user