Skip to contentSkip to conversation

Patch "ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Apr 30, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
alsa-oxfw-fix-regression-to-handle-stanton-scs.1m-1d.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3d016d57fdc5e6caa4cd67896f4b081bccad6e2c Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <[email protected]>
Date: Mon, 3 Apr 2017 21:13:40 +0900
Subject: ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d

From: Takashi Sakamoto <[email protected]>

commit 3d016d57fdc5e6caa4cd67896f4b081bccad6e2c upstream.

At a commit 6c29230e2a5f ("ALSA: oxfw: delayed registration of sound card"), ALSA oxfw driver fails to handle SCS.1m/1d, due to -EBUSY at a call of snd_card_register(). The cause is that the driver manages to register two rawmidi instances with the same device number 0. This is a regression introduced since kernel 4.7.

This commit fixes the regression, by fixing up device property after discovering stream formats.

Fixes 6c29230e2a5f ("ALSA: oxfw: delayed registration of sound card")
---
 sound/firewire/oxfw/oxfw.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/firewire/oxfw/oxfw.c +2 -2
@@ -226,11 +226,11 @@ static void do_registration(struct work_
 	if (err < 0)
 		goto error;
 
-	err = detect_quirks(oxfw);
+	err = snd_oxfw_stream_discover(oxfw);
 	if (err < 0)
 		goto error;
 
-	err = snd_oxfw_stream_discover(oxfw);
+	err = detect_quirks(oxfw);
 	if (err < 0)
 		goto error;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/alsa-firewire-lib-fix-inappropriate-assignment-between-signed-unsigned-type.patch queue-4.9/alsa-oxfw-fix-regression-to-handle-stanton-scs.1m-1d.patch