Merge git://git.infradead.org/battery-2.6

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

diff --git a/sound/core/init.c b/sound/core/init.c
index e3338d6071efb993ae9370bf634fdf28ebb27e42..ac0573416130d56b480caf2948a88f1017ad3bb8 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -254,7 +254,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)
        if (likely(df))
                return df->disconnected_f_op->release(inode, file);
 
-       panic("%s(%p, %p) failed!", __FUNCTION__, inode, file);
+       panic("%s(%p, %p) failed!", __func__, inode, file);
 }
 
 static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait)
@@ -311,6 +311,9 @@ int snd_card_disconnect(struct snd_card *card)
        struct file *file;
        int err;
 
+       if (!card)
+               return -EINVAL;
+
        spin_lock(&card->files_lock);
        if (card->shutdown) {
                spin_unlock(&card->files_lock);
@@ -322,6 +325,7 @@ int snd_card_disconnect(struct snd_card *card)
        /* phase 1: disable fops (user space) operations for ALSA API */
        mutex_lock(&snd_card_mutex);
        snd_cards[card->number] = NULL;
+       snd_cards_lock &= ~(1 << card->number);
        mutex_unlock(&snd_card_mutex);
        
        /* phase 2: replace file->f_op with special dummy operations */
@@ -360,6 +364,15 @@ int snd_card_disconnect(struct snd_card *card)
                snd_printk(KERN_ERR "not all devices for card %i can be disconnected\n", card->number);
 
        snd_info_card_disconnect(card);
+#ifndef CONFIG_SYSFS_DEPRECATED
+       if (card->card_dev) {
+               device_unregister(card->card_dev);
+               card->card_dev = NULL;
+       }
+#endif
+#ifdef CONFIG_PM
+       wake_up(&card->power_sleep);
+#endif
        return 0;       
 }
 
@@ -401,33 +414,14 @@ static int snd_card_do_free(struct snd_card *card)
                snd_printk(KERN_WARNING "unable to free card info\n");
                /* Not fatal error */
        }
-#ifndef CONFIG_SYSFS_DEPRECATED
-       if (card->card_dev)
-               device_unregister(card->card_dev);
-#endif
        kfree(card);
        return 0;
 }
 
-static int snd_card_free_prepare(struct snd_card *card)
-{
-       if (card == NULL)
-               return -EINVAL;
-       (void) snd_card_disconnect(card);
-       mutex_lock(&snd_card_mutex);
-       snd_cards[card->number] = NULL;
-       snd_cards_lock &= ~(1 << card->number);
-       mutex_unlock(&snd_card_mutex);
-#ifdef CONFIG_PM
-       wake_up(&card->power_sleep);
-#endif
-       return 0;
-}
-
 int snd_card_free_when_closed(struct snd_card *card)
 {
        int free_now = 0;
-       int ret = snd_card_free_prepare(card);
+       int ret = snd_card_disconnect(card);
        if (ret)
                return ret;
 
@@ -447,7 +441,7 @@ EXPORT_SYMBOL(snd_card_free_when_closed);
 
 int snd_card_free(struct snd_card *card)
 {
-       int ret = snd_card_free_prepare(card);
+       int ret = snd_card_disconnect(card);
        if (ret)
                return ret;