Skip to content

Commit

Permalink
ALSA: oxfw: fix wrong reference count for stream functionality at err…
Browse files Browse the repository at this point in the history
…or path of rawmidi interface

In IEC 61883-6, several types of sampling data can be multiplexed into
payload of common isochronous packet (CIP). For typical audio and music
units, PCM samples and MIDI messages are multiplexed into one packet
streaming.

ALSA oxfw driver allows applications of rawmidi interface to start
packet streaming for transmission of MIDI messages. However at error
path, the reference count of stream functionality is not operated
correctly. This can brings a bug that packet streaming is not stopped
when all referrers release the count.

This commit fixes the bug.

Fixes: 4f380d0 ("ALSA: oxfw: configure packet format in pcm.hw_params callback")
Signed-off-by: Takashi Sakamoto <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
takaswie authored and tiwai committed Jul 7, 2019
1 parent 2e9f17e commit 03a954a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sound/firewire/oxfw/oxfw-midi.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ static int midi_capture_open(struct snd_rawmidi_substream *substream)
if (err >= 0) {
++oxfw->substreams_count;
err = snd_oxfw_stream_start_duplex(oxfw);
if (err < 0)
--oxfw->substreams_count;
}

mutex_unlock(&oxfw->mutex);
Expand Down

0 comments on commit 03a954a

Please sign in to comment.