Merge branch 'for-linus' into for-next

This commit is contained in:
Takashi Iwai
2013-12-16 15:53:52 +01:00
593 changed files with 7564 additions and 3137 deletions

View File

@@ -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++;
}