diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /sound/pci | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/korg1212/korg1212.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 398aa10a06e8..fa8cd8cecc21 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c | |||
@@ -1124,9 +1124,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id) | |||
1124 | u32 doorbellValue; | 1124 | u32 doorbellValue; |
1125 | struct snd_korg1212 *korg1212 = dev_id; | 1125 | struct snd_korg1212 *korg1212 = dev_id; |
1126 | 1126 | ||
1127 | if(irq != korg1212->irq) | ||
1128 | return IRQ_NONE; | ||
1129 | |||
1130 | doorbellValue = readl(korg1212->inDoorbellPtr); | 1127 | doorbellValue = readl(korg1212->inDoorbellPtr); |
1131 | 1128 | ||
1132 | if (!doorbellValue) | 1129 | if (!doorbellValue) |
@@ -1140,7 +1137,6 @@ static irqreturn_t snd_korg1212_interrupt(int irq, void *dev_id) | |||
1140 | 1137 | ||
1141 | korg1212->inIRQ++; | 1138 | korg1212->inIRQ++; |
1142 | 1139 | ||
1143 | |||
1144 | switch (doorbellValue) { | 1140 | switch (doorbellValue) { |
1145 | case K1212_DB_DSPDownloadDone: | 1141 | case K1212_DB_DSPDownloadDone: |
1146 | K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n", | 1142 | K1212_DEBUG_PRINTK("K1212_DEBUG: IRQ DNLD count - %ld, %x, [%s].\n", |