diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2017-04-03 15:13:40 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-03 18:37:42 +0300 |
commit | a33e886d3f19b48cfdc925d59ad6388baf46ccfc (patch) | |
tree | 2c76ad5db309dfbf61552b0e261ff64e12d42ad7 | |
parent | f62c45868079be031b647faa5d42f689aa96d26b (diff) | |
download | linux-a33e886d3f19b48cfdc925d59ad6388baf46ccfc.tar.xz |
ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d
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")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | sound/firewire/oxfw/oxfw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c index e629b88f7d93..474b06d8acd1 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -226,11 +226,11 @@ static void do_registration(struct work_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; |