From: Clemens Ladisch <clemens@ladisch.de>
Date: Tue, 10 May 2005 12:51:40 +0000 (+0200)
Subject: [ALSA] usb-audio - bind to control interface instead of usb_device
X-Git-Tag: v2.6.13-rc1~68^2~643
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dcd3ec4728f9568ee204ceb46b0851be324a7f9;p=linux-2.6

[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>
---

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 34d5f58985..c360ab9783 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) {