summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-06-10 11:08:53 +0200
committerTakashi Iwai <tiwai@suse.de>2010-06-10 11:08:53 +0200
commit2d0a1dbf5715e97e68d33ca5a21a3353c7811215 (patch)
treeb2a154084fa99fbf5f22539cb8ee96935a6301f0 /sound
parentab669967d0ecf784567843180e715ccb0e42db36 (diff)
parentff8bd64eaf2963752feaa0ac2f7ff1254e0091ce (diff)
downloadlinux-2d0a1dbf5715e97e68d33ca5a21a3353c7811215.tar.gz
linux-2d0a1dbf5715e97e68d33ca5a21a3353c7811215.tar.bz2
linux-2d0a1dbf5715e97e68d33ca5a21a3353c7811215.zip
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/atmel/ac97c.c2
-rw-r--r--sound/spi/at73c213.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 428121a7e705..10c3a871a12d 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -657,7 +657,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
if (sr & AC97C_SR_CAEVT) {
struct snd_pcm_runtime *runtime;
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_RXRDY ? " RXRDY" : "",
casr & AC97C_CSR_UNRUN ? " UNRUN" : "",
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 4c7b051f9d17..1bc56b2b94e2 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -69,7 +69,6 @@ struct snd_at73c213 {
int irq;
int period;
unsigned long bitrate;
- struct clk *bitclk;
struct ssc_device *ssc;
struct spi_device *spi;
u8 spi_wbuffer[2];