aboutsummaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-07-07 14:20:08 +0900
committerTakashi Iwai <tiwai@suse.de>2019-07-07 11:19:56 +0200
commit03a954aef70e10003b3f1cf7066ab7c955eb27f1 (patch)
tree5b95930637ccb82b35365752ec13f4f505161055 /sound/firewire
parent2e9f17e34eb7b728d4cd9ec474c3c5a9a6685298 (diff)
downloadlinux-stericsson-03a954aef70e10003b3f1cf7066ab7c955eb27f1.tar.gz
ALSA: oxfw: fix wrong reference count for stream functionality at error 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: 4f380d007052 ("ALSA: oxfw: configure packet format in pcm.hw_params callback") Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/oxfw/oxfw-midi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/oxfw/oxfw-midi.c b/sound/firewire/oxfw/oxfw-midi.c
index 9ba62778add2..92538ab06932 100644
--- a/sound/firewire/oxfw/oxfw-midi.c
+++ b/sound/firewire/oxfw/oxfw-midi.c
@@ -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);