Merge ARM fixes

[linux-2.6] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index 3c493ad620d1e518b73c728fac47605fd41a222e..4b9e609975ab976e5dceb554ef7401e30d5b3daf 100644 (file)
--- 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);