diff mbox

ALSA: firewire-motu: destroy stream data surely at failure of card initialization

Message ID 20170820065502.2555-1-o-takashi@sakamocchi.jp (mailing list archive)
State Accepted
Commit dbd7396b4f24e0c3284fcc05f5def24f52c09884
Headers show

Commit Message

Takashi Sakamoto Aug. 20, 2017, 6:55 a.m. UTC
When failing sound card registration after initializing stream data, this
module leaves allocated data in stream data. This commit fixes the bug.

Fixes: 9b2bb4f2f4a2 ('ALSA: firewire-motu: add stream management functionality')
Cc: <stable@vger.kernel.org> # v4.12+
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/motu/motu.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Takashi Iwai Aug. 20, 2017, 7:42 a.m. UTC | #1
On Sun, 20 Aug 2017 08:55:02 +0200,
Takashi Sakamoto wrote:
> 
> When failing sound card registration after initializing stream data, this
> module leaves allocated data in stream data. This commit fixes the bug.
> 
> Fixes: 9b2bb4f2f4a2 ('ALSA: firewire-motu: add stream management functionality')
> Cc: <stable@vger.kernel.org> # v4.12+
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Applied, thanks.


Takashi
diff mbox

Patch

diff --git a/sound/firewire/motu/motu.c b/sound/firewire/motu/motu.c
index bf779cfeef0d..59a270406353 100644
--- a/sound/firewire/motu/motu.c
+++ b/sound/firewire/motu/motu.c
@@ -128,6 +128,7 @@  static void do_registration(struct work_struct *work)
 	return;
 error:
 	snd_motu_transaction_unregister(motu);
+	snd_motu_stream_destroy_duplex(motu);
 	snd_card_free(motu->card);
 	dev_info(&motu->unit->device,
 		 "Sound card registration failed: %d\n", err);