summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/core.h2
-rw-r--r--sound/core/pcm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 3c493ad..4b9e609 100644
--- a/include/sound/core.h
+++ b/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/sound/core/pcm.c b/sound/core/pcm.c
index 76fcc52..2743414 100644
--- a/sound/core/pcm.c
+++ b/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,
OpenPOWER on IntegriCloud