linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / isa / sb / sb8_midi.c

diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c
index 0b67edd..c549ace 100644 (file)
--- a/sound/isa/sb/sb8_midi.c
+++ b/sound/isa/sb/sb8_midi.c
@@ -32,22 +32,20 @@
 #include <sound/core.h>
 #include <sound/sb.h>
 
+/*
+
+ */
 
-irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb *chip)
+irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb * chip)
 {
        struct snd_rawmidi *rmidi;
        int max = 64;
        char byte;
 
-       if (!chip)
-               return IRQ_NONE;
-       
-       rmidi = chip->rmidi;
-       if (!rmidi) {
+       if (chip == NULL || (rmidi = chip->rmidi) == NULL) {
                inb(SBP(chip, DATA_AVAIL));     /* ack interrupt */
                return IRQ_NONE;
        }
-
        spin_lock(&chip->midi_input_lock);
        while (max-- > 0) {
                if (inb(SBP(chip, DATA_AVAIL)) & 0x80) {
@@ -61,6 +59,10 @@ irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb *chip)
        return IRQ_HANDLED;
 }
 
+/*
+
+ */
+
 static int snd_sb8dsp_midi_input_open(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
@@ -250,6 +252,10 @@ static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substre
                snd_sb8dsp_midi_output_write(substream);
 }
 
+/*
+
+ */
+
 static struct snd_rawmidi_ops snd_sb8dsp_midi_output =
 {
        .open =         snd_sb8dsp_midi_output_open,