lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/misc' into for-linus

Browse Source
This commit is contained in:
Takashi Iwai
2010-06-10 11:08:53 +02:00
parent ab669967d0 ff8bd64eaf
commit 2d0a1dbf57
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/atmel/ac97c.c
View File

@@ -657,7 +657,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
if (sr & AC97C_SR_CAEVT) { if (sr & AC97C_SR_CAEVT) {
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
int offset, next_period, block_size; int offset, next_period, block_size;
dev_info(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n",
casr & AC97C_CSR_OVRUN ? " OVRUN" : "", casr & AC97C_CSR_OVRUN ? " OVRUN" : "",
casr & AC97C_CSR_RXRDY ? " RXRDY" : "", casr & AC97C_CSR_RXRDY ? " RXRDY" : "",
casr & AC97C_CSR_UNRUN ? " UNRUN" : "", casr & AC97C_CSR_UNRUN ? " UNRUN" : "",

1
sound/spi/at73c213.c
View File

@@ -69,7 +69,6 @@ struct snd_at73c213 {
int irq; int irq;
int period; int period;
unsigned long bitrate; unsigned long bitrate;
struct clk *bitclk;
struct ssc_device *ssc; struct ssc_device *ssc;
struct spi_device *spi; struct spi_device *spi;
u8 spi_wbuffer[2]; u8 spi_wbuffer[2];