iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: usb-audio: Create a registration quirk for Kingston HyperX Amp (0951:16d8)

Browse Source 
Create a quirk that allows special processing and/or
skipping the call to snd_card_register.

For HyperX AMP, which uses two interfaces, but only has
a capture stream in the second, this allows the capture
stream to merge with the first PCM.

Signed-off-by: Chris Wulff <crwulff@gmail.com>
Link: https://lore.kernel.org/r/20200314165449.4086-3-crwulff@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Chris Wulff 2020-03-14 12:54:49 -04:00 committed by Takashi Iwai
parent 0aef31b752
commit 55f7326170
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/usb/card.c
View File

@ -662,10 +662,14 @@ static int usb_audio_probe(struct usb_interface *intf,
goto __error; goto __error;
} }
/* we are allowed to call snd_card_register() many times */ /* we are allowed to call snd_card_register() many times, but first
* check to see if a device needs to skip it or do anything special
*/
if (snd_usb_registration_quirk(chip, ifnum) == 0) {
err = snd_card_register(chip->card); err = snd_card_register(chip->card);
if (err < 0) if (err < 0)
goto __error; goto __error;
}
if (quirk && quirk->shares_media_device) { if (quirk && quirk->shares_media_device) {
/* don't want to fail when snd_media_device_create() fails */ /* don't want to fail when snd_media_device_create() fails */

14
sound/usb/quirks.c
View File

@ -1808,3 +1808,17 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
break; break;
} }
} }
int snd_usb_registration_quirk(struct snd_usb_audio *chip,
int iface)
{
switch (chip->usb_id) {
case USB_ID(0x0951, 0x16d8): /* Kingston HyperX AMP */
/* Register only when we reach interface 2 so that streams can
* merge correctly into PCMs from interface 0
*/
return (iface != 2);
}
/* Register as normal */
return 0;
}

3
sound/usb/quirks.h
View File

@ -51,4 +51,7 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
struct audioformat *fp, struct audioformat *fp,
int stream); int stream);
int snd_usb_registration_quirk(struct snd_usb_audio *chip,
int iface);
#endif /* __USBAUDIO_QUIRKS_H */ #endif /* __USBAUDIO_QUIRKS_H */