From ee108165a34c199844b1698b831360b838ece9d9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 15 Jul 2009 10:36:51 +0100 Subject: [PATCH] --- yaml --- r: 157575 b: refs/heads/master c: 4b75e9476737dffef44a66818a4a481edd2512a1 h: refs/heads/master i: 157573: 74863ecfe9efd1c4ede535baada0ca2f0730adbb 157571: 70cdbb2a8a66d913e1aab5affc7369549d77fea5 157567: 913456e04b6ec0476514e61a26e6bd7031841ba3 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm9081.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bde8beb1dcc2..a4125a908b92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e465d544fab81aa122f86a50418f4be7f1fcf066 +refs/heads/master: 4b75e9476737dffef44a66818a4a481edd2512a1 diff --git a/trunk/sound/soc/codecs/wm9081.c b/trunk/sound/soc/codecs/wm9081.c index dbe20597d872..156f2a4a5930 100644 --- a/trunk/sound/soc/codecs/wm9081.c +++ b/trunk/sound/soc/codecs/wm9081.c @@ -707,6 +707,10 @@ static int configure_clock(struct snd_soc_codec *codec) target > 3000000) break; } + + if (i == ARRAY_SIZE(clk_sys_rates)) + return -EINVAL; + } else if (wm9081->fs) { for (i = 0; i < ARRAY_SIZE(clk_sys_rates); i++) { new_sysclk = clk_sys_rates[i].ratio @@ -714,6 +718,10 @@ static int configure_clock(struct snd_soc_codec *codec) if (new_sysclk > 3000000) break; } + + if (i == ARRAY_SIZE(clk_sys_rates)) + return -EINVAL; + } else { new_sysclk = 12288000; }