Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next

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

diff --git a/sound/core/init.c b/sound/core/init.c
index 3541905..04734e0 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -400,7 +400,6 @@ static const struct file_operations snd_shutdown_f_ops =
 int snd_card_disconnect(struct snd_card *card)
 {
        struct snd_monitor_file *mfile;
-       int err;
 
        if (!card)
                return -EINVAL;
@@ -445,9 +444,7 @@ int snd_card_disconnect(struct snd_card *card)
 #endif
 
        /* notify all devices that we are disconnected */
-       err = snd_device_disconnect_all(card);
-       if (err < 0)
-               dev_err(card->dev, "not all devices for card %i can be disconnected\n", card->number);
+       snd_device_disconnect_all(card);
 
        snd_info_card_disconnect(card);
        if (card->registered) {