提交 8579d2d7 编写于 作者: C Clemens Ladisch 提交者: Takashi Iwai

sound: rawmidi: fix double init when opening MIDI device with O_APPEND

Commit 9a1b64ca in 2.6.30 moved the
substream initialization code to where it would be executed every time
the substream is opened.

This had the consequence that any further opening would drop and leak
the data in the existing buffer, and that the device driver's open
callback would be called multiple times, unexpectedly.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 dede17b8
......@@ -266,6 +266,7 @@ static int open_substream(struct snd_rawmidi *rmidi,
{
int err;
if (substream->use_count == 0) {
err = snd_rawmidi_runtime_create(substream);
if (err < 0)
return err;
......@@ -273,10 +274,11 @@ static int open_substream(struct snd_rawmidi *rmidi,
if (err < 0)
return err;
substream->opened = 1;
if (substream->use_count++ == 0)
substream->active_sensing = 0;
if (mode & SNDRV_RAWMIDI_LFLG_APPEND)
substream->append = 1;
}
substream->use_count++;
rmidi->streams[substream->stream].substream_opened++;
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册