diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /sound/pci/korg1212 | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'sound/pci/korg1212')
| -rw-r--r-- | sound/pci/korg1212/korg1212.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index cfea51f4478..fa8cd8cecc2 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -1119,14 +1119,11 @@ static void snd_korg1212_OnDSPDownloadComplete(struct snd_korg1212 *korg1212) snd_korg1212_setCardState(korg1212, K1212_STATE_DSP_COMPLETE); } -static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id) { u32 doorbellValue; struct snd_korg1212 *korg1212 = dev_id; - if(irq != korg1212->irq) - return IRQ_NONE; - doorbellValue = readl(korg1212->inDoorbellPtr); if (!doorbellValue) @@ -1140,7 +1137,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id, struct pt_regs korg1212->inIRQ++; - switch (doorbellValue) { case K1212_DB_DSPDownloadDone: K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n", |