summaryrefslogtreecommitdiffstats
path: root/sound/atmel
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-12-16 15:53:52 +0100
committerTakashi Iwai <tiwai@suse.de>2013-12-16 15:53:52 +0100
commitd09476018bee39495d6ece7a2e069de29a9c0ed5 (patch)
tree866fff4323f94681e6b423f269f0549df0a34066 /sound/atmel
parent337bb336b95bd7884fa3a194eafbdf52a0216b2e (diff)
parentafdcd431cebe3498db9aa963c780fdd5099917ec (diff)
downloadlinux-stable-d09476018bee39495d6ece7a2e069de29a9c0ed5.tar.gz
linux-stable-d09476018bee39495d6ece7a2e069de29a9c0ed5.tar.bz2
linux-stable-d09476018bee39495d6ece7a2e069de29a9c0ed5.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/atmel')
-rw-r--r--sound/atmel/abdac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index b78a3bc6f35e..3519518e25a0 100644
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -357,7 +357,8 @@ static int set_sample_rates(struct atmel_abdac *dac)
if (new_rate <= 0)
break;
/* make sure we are below the ABDAC clock */
- if (new_rate <= clk_get_rate(dac->pclk)) {
+ if (index < MAX_NUM_RATES &&
+ new_rate <= clk_get_rate(dac->pclk)) {
dac->rates[index] = new_rate / 256;
index++;
}