From: Chris Wulff <crwulff@xxxxxxxxx>
The newer version of the HyperX Amp has controls on two
separate USB interfaces (0 and 2.)
This patch fixes the use of two separate usb interfaces
for controls and audio by using the controls mixer interface
instead of the card interface for each control and by not
merging new streams with a pcm device that has already
been registered.
Signed-off-by: Chris Wulff <crwulff@xxxxxxxxx>
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 45eee5cc312e..2498107ca89f 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -306,7 +306,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request,
return -EIO;
while (timeout-- > 0) {
- idx = snd_usb_ctrl_intf(chip) | (cval->head.id << 8);
+ idx = cval->head.mixer->hostif->desc.bInterfaceNumber | (cval->head.id << 8);
err = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,
USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
validx, idx, buf, val_len);
@@ -354,7 +354,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request,
if (ret)
goto error;
- idx = snd_usb_ctrl_intf(chip) | (cval->head.id << 8);
+ idx = cval->head.mixer->hostif->desc.bInterfaceNumber | (cval->head.id << 8);
ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
validx, idx, buf, size);
@@ -479,7 +479,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
return -EIO;
while (timeout-- > 0) {
- idx = snd_usb_ctrl_intf(chip) | (cval->head.id << 8);
+ idx = cval->head.mixer->hostif->desc.bInterfaceNumber | (cval->head.id << 8);
err = snd_usb_ctl_msg(chip->dev,
usb_sndctrlpipe(chip->dev, 0), request,
USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
@@ -1195,7 +1195,7 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
get_ctl_value(cval, UAC_GET_MIN, (cval->control << 8) | minchn, &cval->min) < 0) {
usb_audio_err(cval->head.mixer->chip,
"%d:%d: cannot get min/max values for control %d (id %d)\n",
- cval->head.id, snd_usb_ctrl_intf(cval->head.mixer->chip),
+ cval->head.id, cval->head.mixer->hostif->desc.bInterfaceNumber,
cval->control, cval->head.id);
return -EINVAL;
}
@@ -1414,7 +1414,7 @@ static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol,
if (ret)
goto error;
- idx = snd_usb_ctrl_intf(chip) | (cval->head.id << 8);
+ idx = cval->head.mixer->hostif->desc.bInterfaceNumber | (cval->head.id << 8);
if (cval->head.mixer->protocol == UAC_VERSION_2) {
struct uac2_connectors_ctl_blk uac2_conn;
@@ -3192,7 +3192,7 @@ static void snd_usb_mixer_proc_read(struct snd_info_entry *entry,
list_for_each_entry(mixer, &chip->mixer_list, list) {
snd_iprintf(buffer,
"USB Mixer: usb_id=0x%08x, ctrlif=%i, ctlerr=%i\n",
- chip->usb_id, snd_usb_ctrl_intf(chip),
+ chip->usb_id, mixer->hostif->desc.bInterfaceNumber,
mixer->ignore_ctl_error);
snd_iprintf(buffer, "Card: %s\n", chip->card->longname);
for (unitid = 0; unitid < MAX_ID_ELEMS; unitid++) {
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 11785f9652ad..d286c18f8d43 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -482,6 +482,7 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,
struct snd_usb_stream *as;
struct snd_usb_substream *subs;
struct snd_pcm *pcm;
+ struct snd_device *dev;
int err;
list_for_each_entry(as, &chip->pcm_list, list) {
@@ -502,6 +503,13 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,
subs = &as->substream[stream];
if (subs->ep_num)
continue;
+
+ list_for_each_entry(dev, &as->pcm->card->devices, list)
+ if (dev->device_data == as->pcm)
+ break;
+ if (dev && (dev->state == SNDRV_DEV_REGISTERED))
+ continue;
+
err = snd_pcm_new_stream(as->pcm, stream, 1);
if (err < 0)
return err;
--
2.20.1
