summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-05-10 14:51:40 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 10:06:43 +0200
commit1dcd3ec4728f9568ee204ceb46b0851be324a7f9 (patch)
tree9c89dfeb83d373627b5b47b0fbf2defd0f0ed4df /sound/usb
parent462c4173509c5d1ebdc6cfd58f7236c2ac467e30 (diff)
downloadop-kernel-dev-1dcd3ec4728f9568ee204ceb46b0851be324a7f9.zip
op-kernel-dev-1dcd3ec4728f9568ee204ceb46b0851be324a7f9.tar.gz
[ALSA] usb-audio - bind to control interface instead of usb_device
USB generic driver Bind the device files to the (first) audio control interface instead of the entire USB device. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 34d5f58..c360ab9 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3129,8 +3129,6 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
snd_usb_audio_create_proc(chip);
- snd_card_set_dev(card, &dev->dev);
-
*rchip = chip;
return 0;
}
@@ -3212,6 +3210,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
if (snd_usb_audio_create(dev, i, quirk, &chip) < 0) {
goto __error;
}
+ snd_card_set_dev(chip->card, &intf->dev);
break;
}
if (! chip) {
OpenPOWER on IntegriCloud