diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:14 +0000 |
| commit | fa17cb4a02b698eb7086effd43b277a01372c0d8 (patch) | |
| tree | 04270b35515a1c2b7618de1af842d5f0cace4d7f /sound | |
| parent | 587691ea396b4e3dc6ef2349e71f93292d55fc63 (diff) | |
| parent | 3271a4fc7daeb489bfe1730023c166065e6fb0e7 (diff) | |
| download | linux-fa17cb4a02b698eb7086effd43b277a01372c0d8.tar.gz linux-fa17cb4a02b698eb7086effd43b277a01372c0d8.tar.bz2 linux-fa17cb4a02b698eb7086effd43b277a01372c0d8.zip | |
Merge remote-tracking branch 'asoc/fix/cs42l52' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cs42l52.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 99bb1c69499e..9811a5478c87 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -737,7 +737,7 @@ static const struct cs42l52_clk_para clk_map_table[] = { static int cs42l52_get_clk(int mclk, int rate) { - int i, ret = 0; + int i, ret = -EINVAL; u_int mclk1, mclk2 = 0; for (i = 0; i < ARRAY_SIZE(clk_map_table); i++) { @@ -749,8 +749,6 @@ static int cs42l52_get_clk(int mclk, int rate) } } } - if (ret > ARRAY_SIZE(clk_map_table)) - return -EINVAL; return ret; } |