* [PATCH] ALSA: dice: fix error path to destroy initialized stream data
@ 2018-04-26 13:00 Takashi Sakamoto
2018-04-26 13:25 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Sakamoto @ 2018-04-26 13:00 UTC (permalink / raw)
To: clemens, tiwai; +Cc: alsa-devel, stable
In error path of snd_dice_stream_init_duplex(), stream data for incoming
packet can be left to be initialized.
This commit fixes it.
Fixes: 436b5abe2224 ('ALSA: dice: handle whole available isochronous streams')
Cc: <stable@vger.kernel.org> # v4.6+
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
sound/firewire/dice/dice-stream.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c
index 8573289c381e..928a255bfc35 100644
--- a/sound/firewire/dice/dice-stream.c
+++ b/sound/firewire/dice/dice-stream.c
@@ -435,7 +435,7 @@ int snd_dice_stream_init_duplex(struct snd_dice *dice)
err = init_stream(dice, AMDTP_IN_STREAM, i);
if (err < 0) {
for (; i >= 0; i--)
- destroy_stream(dice, AMDTP_OUT_STREAM, i);
+ destroy_stream(dice, AMDTP_IN_STREAM, i);
goto end;
}
}
--
2.14.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: dice: fix error path to destroy initialized stream data
2018-04-26 13:00 [PATCH] ALSA: dice: fix error path to destroy initialized stream data Takashi Sakamoto
@ 2018-04-26 13:25 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2018-04-26 13:25 UTC (permalink / raw)
To: Takashi Sakamoto; +Cc: clemens, alsa-devel, stable
On Thu, 26 Apr 2018 15:00:29 +0200,
Takashi Sakamoto wrote:
>
> In error path of snd_dice_stream_init_duplex(), stream data for incoming
> packet can be left to be initialized.
>
> This commit fixes it.
>
> Fixes: 436b5abe2224 ('ALSA: dice: handle whole available isochronous streams')
> Cc: <stable@vger.kernel.org> # v4.6+
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-26 13:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-26 13:00 [PATCH] ALSA: dice: fix error path to destroy initialized stream data Takashi Sakamoto
2018-04-26 13:25 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).