Merge tag 'for-5.12/block-ipi-2021-02-21' of git://git.kernel.dk/linux-block

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

diff --git a/sound/core/init.c b/sound/core/init.c
index 764dbe6..45f4b01 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -13,7 +13,9 @@
 #include <linux/time.h>
 #include <linux/ctype.h>
 #include <linux/pm.h>
+#include <linux/debugfs.h>
 #include <linux/completion.h>
+#include <linux/interrupt.h>
 
 #include <sound/core.h>
 #include <sound/control.h>
@@ -149,8 +151,6 @@ static void release_card_device(struct device *dev)
  *  @extra_size: allocate this extra size after the main soundcard structure
  *  @card_ret: the pointer to store the created card instance
  *
- *  Creates and initializes a soundcard structure.
- *
  *  The function allocates snd_card instance via kzalloc with the given
  *  space for the driver to use freely.  The allocated struct is stored
  *  in the given card_ret pointer.
@@ -163,6 +163,9 @@ int snd_card_new(struct device *parent, int idx, const char *xid,
 {
        struct snd_card *card;
        int err;
+#ifdef CONFIG_SND_DEBUG
+       char name[8];
+#endif
 
        if (snd_BUG_ON(!card_ret))
                return -EINVAL;
@@ -176,7 +179,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid,
        if (extra_size > 0)
                card->private_data = (char *)card + sizeof(struct snd_card);
        if (xid)
-               strlcpy(card->id, xid, sizeof(card->id));
+               strscpy(card->id, xid, sizeof(card->id));
        err = 0;
        mutex_lock(&snd_card_mutex);
        if (idx < 0) /* first check the matching module-name slot */
@@ -246,6 +249,12 @@ int snd_card_new(struct device *parent, int idx, const char *xid,
                dev_err(parent, "unable to create card info\n");
                goto __error_ctl;
        }
+
+#ifdef CONFIG_SND_DEBUG
+       sprintf(name, "card%d", idx);
+       card->debugfs_root = debugfs_create_dir(name, sound_debugfs_root);
+#endif
+
        *card_ret = card;
        return 0;
 
@@ -418,6 +427,9 @@ int snd_card_disconnect(struct snd_card *card)
        /* notify all devices that we are disconnected */
        snd_device_disconnect_all(card);
 
+       if (card->sync_irq > 0)
+               synchronize_irq(card->sync_irq);
+
        snd_info_card_disconnect(card);
        if (card->registered) {
                device_del(&card->card_dev);
@@ -479,6 +491,10 @@ static int snd_card_do_free(struct snd_card *card)
                dev_warn(card->dev, "unable to free card info\n");
                /* Not fatal error */
        }
+#ifdef CONFIG_SND_DEBUG
+       debugfs_remove(card->debugfs_root);
+       card->debugfs_root = NULL;
+#endif
        if (card->release_completion)
                complete(card->release_completion);
        kfree(card);
@@ -528,6 +544,7 @@ int snd_card_free(struct snd_card *card)
                return ret;
        /* wait, until all devices are ready for the free operation */
        wait_for_completion(&released);
+
        return 0;
 }
 EXPORT_SYMBOL(snd_card_free);
@@ -625,7 +642,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *src,
        /* last resort... */
        dev_err(card->dev, "unable to set card id (%s)\n", id);
        if (card->proc_root->name)
-               strlcpy(card->id, card->proc_root->name, sizeof(card->id));
+               strscpy(card->id, card->proc_root->name, sizeof(card->id));
 }
 
 /**