diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-11-14 16:42:04 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-14 17:50:57 +0100 |
| commit | 5d5563b14fe34021b690eb3edc54abcc876e417c (patch) | |
| tree | 159cb6da3d45c7858ae066b6d73fe38f1775c07b /sound | |
| parent | 86f799b82f5c011404ddef54600bc5e99b7e0cf2 (diff) | |
| download | talos-obmc-linux-5d5563b14fe34021b690eb3edc54abcc876e417c.tar.gz talos-obmc-linux-5d5563b14fe34021b690eb3edc54abcc876e417c.zip | |
ALSA: dice: fix detection of Loud devices
Commit a471fcde8c2c ("ALSA: dice: fix detection of Weiss devices") adds
a quirk of Weiss models. According to users' reports, Loud models also
have the similar quirk. They have 0x10 in the category field.
This commit adds support for Mackie Onyx Blackbird and Onyx-i series.
As long as I know, Dice-based models produced by
Focusrite/Alesis/PreSonus/M-Audio/TC Electronic have default value (0x04)
in their category field, thus it may be reasonable to add a condition
statement for Loud models, instead of removing the check of category value.
Reported-by: Rouge Etienne <erouge.externe@m6.fr>
Reported-by: Etilem <contact@etilem.net>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/dice/dice.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c index 5d99436dfcae..0cda05c72f50 100644 --- a/sound/firewire/dice/dice.c +++ b/sound/firewire/dice/dice.c @@ -12,9 +12,11 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>"); MODULE_LICENSE("GPL v2"); #define OUI_WEISS 0x001c6a +#define OUI_LOUD 0x000ff2 #define DICE_CATEGORY_ID 0x04 #define WEISS_CATEGORY_ID 0x00 +#define LOUD_CATEGORY_ID 0x10 static int dice_interface_check(struct fw_unit *unit) { @@ -57,6 +59,8 @@ static int dice_interface_check(struct fw_unit *unit) } if (vendor == OUI_WEISS) category = WEISS_CATEGORY_ID; + else if (vendor == OUI_LOUD) + category = LOUD_CATEGORY_ID; else category = DICE_CATEGORY_ID; if (device->config_rom[3] != ((vendor << 8) | category) || |
