diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-07-07 14:20:07 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-07 11:19:56 +0200 |
| commit | 2e9f17e34eb7b728d4cd9ec474c3c5a9a6685298 (patch) | |
| tree | 826895ae1ecfcd14cbd0c79345f1a7a0a0558acd | |
| parent | 097f8ba3873dcbd2f55c627ed2fe0b13845e53cd (diff) | |
| download | linux-stable-2e9f17e34eb7b728d4cd9ec474c3c5a9a6685298.tar.gz linux-stable-2e9f17e34eb7b728d4cd9ec474c3c5a9a6685298.tar.bz2 linux-stable-2e9f17e34eb7b728d4cd9ec474c3c5a9a6685298.zip | |
ALSA: fireworks: 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 fireworks 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: 3d7250667ea9 ("ALSA: fireworks: configure sampling transfer frequency in pcm.hw_params callback")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/firewire/fireworks/fireworks_midi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/fireworks/fireworks_midi.c b/sound/firewire/fireworks/fireworks_midi.c index 6d3d942e2dce..fd17777981e4 100644 --- a/sound/firewire/fireworks/fireworks_midi.c +++ b/sound/firewire/fireworks/fireworks_midi.c @@ -22,6 +22,8 @@ static int midi_open(struct snd_rawmidi_substream *substream) if (err >= 0) { ++efw->substreams_counter; err = snd_efw_stream_start_duplex(efw); + if (err < 0) + --efw->substreams_counter; } mutex_unlock(&efw->mutex); if (err < 0) |