diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-07-07 08:20:09 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-07 12:19:57 +0300 |
| commit | e79c3f0c006ec26d0de5ba9747f65b81c16f83f1 (patch) | |
| tree | 1eaa856ee77844616798bf5d8a3a03efa18e8869 | |
| parent | 03a954aef70e10003b3f1cf7066ab7c955eb27f1 (diff) | |
| download | linux-e79c3f0c006ec26d0de5ba9747f65b81c16f83f1.tar.xz | |
ALSA: dice: 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 dice 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: 3cd2c2d780a2 ("ALSA: dice: reserve/release isochronous resources in pcm.hw_params/hw_free callbacks")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/firewire/dice/dice-midi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/firewire/dice/dice-midi.c b/sound/firewire/dice/dice-midi.c index 436f0c3c0fbb..30a0b8200160 100644 --- a/sound/firewire/dice/dice-midi.c +++ b/sound/firewire/dice/dice-midi.c @@ -22,6 +22,8 @@ static int midi_open(struct snd_rawmidi_substream *substream) if (err >= 0) { ++dice->substreams_counter; err = snd_dice_stream_start_duplex(dice); + if (err < 0) + --dice->substreams_counter; } mutex_unlock(&dice->mutex); |