From 8edc2dcdfc3dbf5eef36bd7ca224979210a891cf Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Tue, 13 Jun 2006 11:58:12 +0200 Subject: [PATCH] --- yaml --- r: 28541 b: refs/heads/master c: 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 h: refs/heads/master i: 28539: ef54b56dde5de5bd8d1621e13450151413184a68 v: v3 --- [refs] | 2 +- trunk/sound/isa/sb/sb8_midi.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e0032f3cd760..1c9a9986e5ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6540dffa6ecfe0d99fb263548dcc4b35ccefe784 +refs/heads/master: 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 diff --git a/trunk/sound/isa/sb/sb8_midi.c b/trunk/sound/isa/sb/sb8_midi.c index c549aceea294..0b67edd7ac6e 100644 --- a/trunk/sound/isa/sb/sb8_midi.c +++ b/trunk/sound/isa/sb/sb8_midi.c @@ -32,20 +32,22 @@ #include #include -/* - - */ -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 == NULL || (rmidi = chip->rmidi) == NULL) { + if (!chip) + return IRQ_NONE; + + rmidi = chip->rmidi; + if (!rmidi) { 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) { @@ -59,10 +61,6 @@ 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; @@ -252,10 +250,6 @@ 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,