diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /sound/atmel | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'sound/atmel')
| -rw-r--r-- | sound/atmel/abdac.c | 3 | ||||
| -rw-r--r-- | sound/atmel/ac97c.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 721d8fd..872d59e 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -357,8 +357,7 @@ static int set_sample_rates(struct atmel_abdac *dac) if (new_rate < 0) break; /* make sure we are below the ABDAC clock */ - if (index < MAX_NUM_RATES && - new_rate <= clk_get_rate(dac->pclk)) { + if (new_rate <= clk_get_rate(dac->pclk)) { dac->rates[index] = new_rate / 256; index++; } diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index c5f0ddd..ae63d22 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -34,6 +34,7 @@ #include <linux/dw_dmac.h> #include <mach/cpu.h> +#include <mach/gpio.h> #ifdef CONFIG_ARCH_AT91 #include <mach/hardware.h> |