Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

This commit is contained in:
Mark Brown
2013-02-11 11:06:27 +00:00
8 changed files with 16 additions and 26 deletions

View File

@@ -192,7 +192,7 @@ config ICS932S401
config ATMEL_SSC
tristate "Device driver for Atmel SSC peripheral"
depends on AVR32 || ARCH_AT91
depends on HAS_IOMEM
---help---
This option enables device driver support for Atmel Synchronized
Serial Communication peripheral (SSC).

View File

@@ -175,7 +175,7 @@ static int ssc_probe(struct platform_device *pdev)
/* disable all interrupts */
clk_enable(ssc->clk);
ssc_writel(ssc->regs, IDR, ~0UL);
ssc_writel(ssc->regs, IDR, -1);
ssc_readl(ssc->regs, SR);
clk_disable(ssc->clk);