1 files changed, 11 insertions, 7 deletions

diff --git a/sound/core/init.c b/sound/core/init.c
index 6152a7554dfd..a4cc6b155ae9 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -361,8 +361,10 @@ static int snd_card_do_free(struct snd_card *card)
                 snd_printk(KERN_WARNING "unable to free card info\n");
                 /* Not fatal error */
         }
-        if (card->dev)
-                device_unregister(card->dev);
+#ifndef CONFIG_SYSFS_DEPRECATED
+        if (card->card_dev)
+                device_unregister(card->card_dev);
+#endif
         kfree(card);
         return 0;
 }
@@ -497,12 +499,14 @@ int snd_card_register(struct snd_card *card)
         int err;
 
         snd_assert(card != NULL, return -EINVAL);
-        if (!card->dev) {
-                card->dev = device_create(sound_class, card->parent, 0,
-                                          "card%i", card->number);
-                if (IS_ERR(card->dev))
-                        card->dev = NULL;
+#ifndef CONFIG_SYSFS_DEPRECATED
+        if (!card->card_dev) {
+                card->card_dev = device_create(sound_class, card->dev, 0,
+                                               "card%i", card->number);
+                if (IS_ERR(card->card_dev))
+                        card->card_dev = NULL;
         }
+#endif
         if ((err = snd_device_register_all(card)) < 0)
                 return err;
         mutex_lock(&snd_card_mutex);