Merge branch 'for-4.5/core' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 20f37fb3800ecce8222fc67ef48afa91f65ecb4c..6bda8436d7652299a90c29d5608c0b4b34f4f693 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -268,6 +268,9 @@ int snd_card_new(struct device *parent, int idx, const char *xid,
        if (err < 0)
                goto __error;
 
+       snprintf(card->irq_descr, sizeof(card->irq_descr), "%s:%s",
+                dev_driver_string(card->dev), dev_name(&card->card_dev));
+
        /* the control interface cannot be accessed from the user space until */
        /* snd_cards_bitmask and snd_cards are set with snd_card_register */
        err = snd_ctl_create(card);