Commit 8579d2d7 authored Oct 21, 2009 by Clemens Ladisch Committed by Takashi Iwai Nov 10, 2009

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: Clemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent dede17b8

sound/core/rawmidi.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message