From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 17 Jan 2013 06:31:54 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4706ccbbe89c0c1871134f493de8b27864b869ba;p=linux-beck.git

Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona

Conflicts:
	sound/soc/codecs/arizona.c
---

4706ccbbe89c0c1871134f493de8b27864b869ba
diff --cc sound/soc/codecs/arizona.c
index a12dd1669886,ef62c435848e..316f074e686c
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@ -778,7 -675,17 +778,7 @@@ static int arizona_hw_params(struct snd
  		return -EINVAL;
  	}
  
- 	lrclk = snd_soc_params_to_bclk(params) / params_rate(params);
 -	for (i = 0; i < ARRAY_SIZE(arizona_sr_vals); i++)
 -		if (arizona_sr_vals[i] == params_rate(params))
 -			break;
 -	if (i == ARRAY_SIZE(arizona_sr_vals)) {
 -		arizona_aif_err(dai, "Unsupported sample rate %dHz\n",
 -				params_rate(params));
 -		return -EINVAL;
 -	}
 -	sr_val = i;
 -
+ 	lrclk = rates[bclk] / params_rate(params);
  
  	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
  			rates[bclk], rates[bclk] / lrclk);