From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 16 Dec 2013 14:53:52 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d09476018bee39495d6ece7a2e069de29a9c0ed5;p=deliverable%2Flinux.git

Merge branch 'for-linus' into for-next
---

d09476018bee39495d6ece7a2e069de29a9c0ed5
diff --cc sound/atmel/abdac.c
index b78a3bc6f35e,721d8fd45685..3519518e25a0
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@@ -354,10 -354,11 +354,11 @@@ static int set_sample_rates(struct atme
  	/* we start at 192 kHz and work our way down to 5112 Hz */
  	while (new_rate >= RATE_MIN && index < (MAX_NUM_RATES + 1)) {
  		new_rate = clk_round_rate(dac->sample_clk, 256 * new_rate);
 -		if (new_rate < 0)
 +		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++;
  		}