Skip to content

Commit 3d016d5

Browse files
takaswietiwai
authored andcommitted
ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d
At a commit 6c29230 ("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: 6c29230 ("ALSA: oxfw: delayed registration of sound card") Cc: <[email protected]> # 4.7+ Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent 2f726ae commit 3d016d5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/firewire/oxfw/oxfw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ static void do_registration(struct work_struct *work)
227227
if (err < 0)
228228
goto error;
229229

230-
err = detect_quirks(oxfw);
230+
err = snd_oxfw_stream_discover(oxfw);
231231
if (err < 0)
232232
goto error;
233233

234-
err = snd_oxfw_stream_discover(oxfw);
234+
err = detect_quirks(oxfw);
235235
if (err < 0)
236236
goto error;
237237

0 commit comments

Comments
 (0)