From 89941a44631fda7730f405229f8ee9e1bd38b6c6 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Tue, 10 May 2005 14:51:40 +0200
Subject: [PATCH] --- yaml --- r: 1555 b: refs/heads/master c:
 1dcd3ec4728f9568ee204ceb46b0851be324a7f9 h: refs/heads/master i:   1553:
 d6fe0ca3f067c4ef8f6656c96c4c86e61a3cea2a   1551:
 d2b5a4dc0c29f3858488a60e7a8d5dd093caa3af v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/usbaudio.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6d2585a7e0b..56818dc84d1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 462c4173509c5d1ebdc6cfd58f7236c2ac467e30
+refs/heads/master: 1dcd3ec4728f9568ee204ceb46b0851be324a7f9
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index 34d5f58985b6..c360ab9783d5 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/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) {