m68k: Disable Amiga serial console support if modular

[linux-2.6-omap-h63xx.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index df46bbc25dc2da7dccf2872abbae76837693e3ba..ef2352c2e45116a824f4e8275e590a2c7394594b 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -545,12 +545,13 @@ int snd_card_register(struct snd_card *card)
 {
        int err;
 
-       snd_assert(card != NULL, return -EINVAL);
+       if (snd_BUG_ON(!card))
+               return -EINVAL;
 #ifndef CONFIG_SYSFS_DEPRECATED
        if (!card->card_dev) {
-               card->card_dev = device_create_drvdata(sound_class, card->dev,
-                                                      MKDEV(0, 0), NULL,
-                                                      "card%i", card->number);
+               card->card_dev = device_create(sound_class, card->dev,
+                                              MKDEV(0, 0), NULL,
+                                              "card%i", card->number);
                if (IS_ERR(card->card_dev))
                        card->card_dev = NULL;
        }