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) {