diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2004-05-17 19:28:56 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2004-05-17 19:28:56 +0200 |
| commit | fcdd368f2c7fa33f04ce973cb54dde750de38691 (patch) | |
| tree | c3d11ba8d60cce6630969f15e03a1266180e8ddf /sound | |
| parent | 769109501232c3725046f3030c24fe2c7046fa3c (diff) | |
| download | history-fcdd368f2c7fa33f04ce973cb54dde750de38691.tar.gz | |
ALSA CVS update - Takashi Iwai <tiwai@suse.de>
Sound Core PDAudioCF driver
- fixed the changed function decleration.
- fixed the return value from cast check.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 | ||||
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index 35a03971c9b096..440a92c66b2caa 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h @@ -140,7 +140,7 @@ int snd_pdacf_suspend(snd_card_t *card, unsigned int state); int snd_pdacf_resume(snd_card_t *card, unsigned int state); #endif int snd_pdacf_pcm_new(pdacf_t *chip); -void pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); +irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); void pdacf_tasklet(unsigned long private_data); void pdacf_reinit(pdacf_t *chip, int resume); diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index eb3c1dfe5bb514..14443f07d30396 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c @@ -28,7 +28,7 @@ */ irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs) { - pdacf_t *chip = snd_magic_cast(pdacf_t, dev, return); + pdacf_t *chip = snd_magic_cast(pdacf_t, dev, return IRQ_NONE); unsigned short stat; if ((chip->chip_status & (PDAUDIOCF_STAT_IS_STALE| |