[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-arm-kernel
Subject:    linux-2.4.70-rmk1-pxa1: fix warning in sound/oss/pxa-ac97.c
From:       Holger Schurig <holgerschurig () gmx ! de>
Date:       2003-07-12 12:17:59
[Download RAW message or body]

There are some warning in pxa-ac97.c, one is because of the new interrupt 
handler return value. I'm not sure if my patch for this is complete, I'd have 
to read more about "completions".

The other two patches are just fixing some lightly bogus variable stuff.

--- linux-2.5.70/sound/oss/pxa-ac97.c~pxa1-fixes
+++ linux-2.5.70/sound/oss/pxa-ac97.c
@@ -101,12 +101,13 @@
 	//printk("%s(0x%02x, 0x%04x)\n", __FUNCTION__, reg, val);
 }
 
-static void pxa_ac97_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pxa_ac97_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
 	if (GSR & (GSR_SDONE|GSR_CDONE)) {
 		GSR = GSR_SDONE|GSR_CDONE;
 		complete(&CAR_completion);
 	}
+	return IRQ_HANDLED;
 }
 
 static struct ac97_codec pxa_ac97_codec = {
@@ -189,7 +190,7 @@
 static int mixer_ioctl( struct inode *inode, struct file *file,
 			unsigned int cmd, unsigned long arg)
 {
-	int ret, val;
+	int ret;
 
 	ret = pxa_ac97_codec.mixer_ioctl(&pxa_ac97_codec, cmd, arg);
 	if (ret)
@@ -246,7 +247,7 @@
 		      unsigned int cmd, unsigned long arg)
 {
 	int ret;
-	long val;
+	long val = 0;
 
 	switch(cmd) {
 	case SNDCTL_DSP_STEREO:

-------------------------------------------------------------------
Subscription options: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ/Etiquette:       http://www.arm.linux.org.uk/armlinux/mailinglists.php

[prev in list] [next in list] [prev in thread] [next in thread]