Update of /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14875
Modified Files:
pdaudiocf_irq.c
Log Message:
Updated interrupt function to 2.6 irq API
Index: pdaudiocf_irq.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_irq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pdaudiocf_irq.c 20 Mar 2004 19:16:59 -0000 1.3
+++ pdaudiocf_irq.c 5 May 2004 13:29:56 -0000 1.4
@@ -26,7 +26,7 @@
/*
*
*/
-void pdacf_interrupt(int irq, void *dev, struct pt_regs *regs)
+irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs)
{
pdacf_t *chip = snd_magic_cast(pdacf_t, dev, return);
unsigned short stat;
@@ -34,7 +34,7 @@
if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE|
PDAUDIOCF_STAT_IS_CONFIGURED|
PDAUDIOCF_STAT_IS_SUSPENDED)) !=
PDAUDIOCF_STAT_IS_CONFIGURED)
- return;
+ return IRQ_HANDLED; /* IRQ_NONE here? */
stat = inw(chip->port + PDAUDIOCF_REG_ISR);
if (stat & (PDAUDIOCF_IRQLVL|PDAUDIOCF_IRQOVR)) {
@@ -47,6 +47,7 @@
}
if (regs != NULL)
snd_ak4117_check_rate_and_errors(chip->ak4117, 0);
+ return IRQ_HANDLED;
}
static inline void pdacf_transfer_mono16(u16 *dst, u16 xor, unsigned int size,
unsigned long rdp_port)
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
