X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=sound%2Fcore%2Fpcm.c;h=cf9b9493d41deba8810dfe266353e294d7d05af1;hb=4acadb965c4aa587aac29a0a91203c4745d6fb4e;hp=76fcc5234d83dc85820ccd2a32982002ef3a81b8;hpb=9244b2c3079faac79b3b961116bd548c45087e2c;p=mv-sheeva.git

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 76fcc5234d8..cf9b9493d41 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <sound/control.h>
 #include <sound/info.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Abramo Bagnara <abramo@alsa-project.org>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Abramo Bagnara <abramo@alsa-project.org>");
 MODULE_DESCRIPTION("Midlevel PCM code for ALSA.");
 MODULE_LICENSE("GPL");
 
@@ -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,