diff --git a/[refs] b/[refs]
index d7839326cf89..e732a7623545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48ec15dca87805cf771855612d647bfe1a9f617f
+refs/heads/master: c2902c8ae06762d941fab64198467f78cab6f8cd
diff --git a/trunk/include/sound/core.h b/trunk/include/sound/core.h
index 3c493ad620d1..4b9e609975ab 100644
--- a/trunk/include/sound/core.h
+++ b/trunk/include/sound/core.h
@@ -242,7 +242,7 @@ static inline int snd_register_device(int type, struct snd_card *card, int dev,
 {
 	return snd_register_device_for_dev(type, card, dev, f_ops,
 					   private_data, name,
-					   card ? card->dev : NULL);
+					   snd_card_get_device_link(card));
 }
 
 int snd_unregister_device(int type, struct snd_card *card, int dev);
diff --git a/trunk/sound/core/pcm.c b/trunk/sound/core/pcm.c
index 76fcc5234d83..2743414fc8fa 100644
--- a/trunk/sound/core/pcm.c
+++ b/trunk/sound/core/pcm.c
@@ -968,7 +968,7 @@ static int snd_pcm_dev_register(struct snd_device *device)
 		 * if possible */
 		dev = pcm->dev;
 		if (!dev)
-			dev = pcm->card ? pcm->card->dev : NULL;
+			dev = snd_card_get_device_link(pcm->card);
 		/* register pcm */
 		err = snd_register_device_for_dev(devtype, pcm->card,
 						  pcm->device,