summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-04-12 07:16:07 +0200
committerTakashi Iwai <tiwai@suse.de>2017-04-12 07:16:07 +0200
commitb7c5ac88e8251cc3931ce00437fdd74b0dbb2e99 (patch)
treee4afa61fcc97fc24cd75dca2a362ecba9fe91669 /sound/firewire
parentc6b0b9e65f094deabc0c1d499b96ed5085b0f7db (diff)
parent3d016d57fdc5e6caa4cd67896f4b081bccad6e2c (diff)
downloadlinux-stable-b7c5ac88e8251cc3931ce00437fdd74b0dbb2e99.tar.gz
linux-stable-b7c5ac88e8251cc3931ce00437fdd74b0dbb2e99.tar.bz2
linux-stable-b7c5ac88e8251cc3931ce00437fdd74b0dbb2e99.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/oxfw/oxfw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 74d7fb6efce6..413ab6313bb6 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;