diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2017-04-03 21:13:40 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-04-05 21:35:14 +0200 |
| commit | 3d016d57fdc5e6caa4cd67896f4b081bccad6e2c (patch) | |
| tree | 25edf51c9db096d7a4ebe0b3b7f5ceb1edd3394c /sound/firewire | |
| parent | 2f726aec19a9d2c63bec9a8a53a3910ffdcd09f8 (diff) | |
| download | op-kernel-dev-3d016d57fdc5e6caa4cd67896f4b081bccad6e2c.zip op-kernel-dev-3d016d57fdc5e6caa4cd67896f4b081bccad6e2c.tar.gz | |
ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d
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")
Cc: <stable@vger.kernel.org> # 4.7+
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -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 74d7fb6..413ab63 100644 --- a/sound/firewire/oxfw/oxfw.c +++ b/sound/firewire/oxfw/oxfw.c @@ -227,11 +227,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; |
