summaryrefslogtreecommitdiffstats
path: root/sound/firewire/oxfw/oxfw.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-12-22 09:15:39 +0900
committerTakashi Iwai <tiwai@suse.de>2015-12-22 11:51:27 +0100
commit3f47152a1c8f4d4c8ca18740bf3f1a7fff1b3fd9 (patch)
tree5459d070e9ee22cb4b7a80f3e19c918de9d5eaa8 /sound/firewire/oxfw/oxfw.c
parentd6ce6bbd7d83453ce958cfc03b7250dbee3a431e (diff)
downloadlinux-3f47152a1c8f4d4c8ca18740bf3f1a7fff1b3fd9.tar.bz2
ALSA: oxfw: add scs1x layer
Stanton Controllers and Systems 1 (SCS.1) series is supported by ALSA scs1x driver. This driver just supports MIDI functionality. On the other hand, models in this series are based on OXFW971 and ALSA OXFW driver can support them. SCS.1 series has MIDI functionality to control its surface state such as LED lighting. When operating physical knobs and faders, the models generate MIDI messages. These MIDI messages are transferred by asynchronous transactions. These transactions are really model-specific and ALSA OXFW driver requires the functionality so as scs1x module implements. This commit adds scs1x layer as a preparation to merge scs1x driver to oxfw driver. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw.c')
-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 96fbb784f086..b20e496e2201 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -216,11 +216,11 @@ static int oxfw_probe(struct fw_unit *unit,
if (err < 0)
goto error;
- err = detect_quirks(oxfw);
+ err = name_card(oxfw);
if (err < 0)
goto error;
- err = name_card(oxfw);
+ err = detect_quirks(oxfw);
if (err < 0)
goto error;