summaryrefslogtreecommitdiff
path: root/sound/usb/card.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-05-02 09:24:42 +0300
committerTakashi Iwai <tiwai@suse.de>2017-05-02 09:24:42 +0300
commitd7dc450d5a7162de96edbed6b1792240c2f3a55f (patch)
treed6dc2d26b393dd69881cd4b9498718f65b35abeb /sound/usb/card.c
parentd4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff)
parent0997e378be1d888a5d093eeee55f842cdfe55ebe (diff)
downloadlinux-d7dc450d5a7162de96edbed6b1792240c2f3a55f.tar.xz
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r--sound/usb/card.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index f36cb068dad3..6640277a725b 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -332,6 +332,7 @@ static int snd_usb_audio_dev_free(struct snd_device *device)
static int snd_usb_audio_create(struct usb_interface *intf,
struct usb_device *dev, int idx,
const struct snd_usb_audio_quirk *quirk,
+ unsigned int usb_id,
struct snd_usb_audio **rchip)
{
struct snd_card *card;
@@ -381,8 +382,7 @@ static int snd_usb_audio_create(struct usb_interface *intf,
atomic_set(&chip->usage_count, 0);
atomic_set(&chip->shutdown, 0);
- chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
- le16_to_cpu(dev->descriptor.idProduct));
+ chip->usb_id = usb_id;
INIT_LIST_HEAD(&chip->pcm_list);
INIT_LIST_HEAD(&chip->ep_list);
INIT_LIST_HEAD(&chip->midi_list);
@@ -569,7 +569,7 @@ static int usb_audio_probe(struct usb_interface *intf,
(vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) &&
(pid[i] == -1 || pid[i] == USB_ID_PRODUCT(id))) {
err = snd_usb_audio_create(intf, dev, i, quirk,
- &chip);
+ id, &chip);
if (err < 0)
goto __error;
chip->pm_intf = intf;