1 files changed, 29 insertions, 10 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 0c29679a8576..574745314e70 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -309,28 +309,29 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
 {
         struct snd_ctl_elem_id id;
         unsigned int idx;
+        int err = -EINVAL;
 
-        snd_assert(card != NULL, return -EINVAL);
         if (! kcontrol)
-                return -EINVAL;
-        snd_assert(kcontrol->info != NULL, return -EINVAL);
+                return err;
+        snd_assert(card != NULL, goto error);
+        snd_assert(kcontrol->info != NULL, goto error);
         id = kcontrol->id;
         down_write(&card->controls_rwsem);
         if (snd_ctl_find_id(card, &id)) {
                 up_write(&card->controls_rwsem);
-                snd_ctl_free_one(kcontrol);
                 snd_printd(KERN_ERR "control %i:%i:%i:%s:%i is already present\n",
                                         id.iface,
                                         id.device,
                                         id.subdevice,
                                         id.name,
                                         id.index);
-                return -EBUSY;
+                err = -EBUSY;
+                goto error;
         }
         if (snd_ctl_find_hole(card, kcontrol->count) < 0) {
                 up_write(&card->controls_rwsem);
-                snd_ctl_free_one(kcontrol);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto error;
         }
         list_add_tail(&kcontrol->list, &card->controls);
         card->controls_count += kcontrol->count;
@@ -340,6 +341,10 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
         for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
                 snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
         return 0;
+
+ error:
+        snd_ctl_free_one(kcontrol);
+        return err;
 }
 
 /**
@@ -658,7 +663,11 @@ static int snd_ctl_elem_info_user(struct snd_ctl_file *ctl,
 
         if (copy_from_user(&info, _info, sizeof(info)))
                 return -EFAULT;
-        result = snd_ctl_elem_info(ctl, &info);
+        snd_power_lock(ctl->card);
+        result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0, NULL);
+        if (result >= 0)
+                result = snd_ctl_elem_info(ctl, &info);
+        snd_power_unlock(ctl->card);
         if (result >= 0)
                 if (copy_to_user(_info, &info, sizeof(info)))
                         return -EFAULT;
@@ -708,7 +717,11 @@ static int snd_ctl_elem_read_user(struct snd_card *card,
                 kfree(control);
                 return -EFAULT;
         }
-        result = snd_ctl_elem_read(card, control);
+        snd_power_lock(card);
+        result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);
+        if (result >= 0)
+                result = snd_ctl_elem_read(card, control);
+        snd_power_unlock(card);
         if (result >= 0)
                 if (copy_to_user(_control, control, sizeof(*control)))
                         result = -EFAULT;
@@ -758,6 +771,7 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
                                    struct snd_ctl_elem_value __user *_control)
 {
         struct snd_ctl_elem_value *control;
+        struct snd_card *card;
         int result;
 
         control = kmalloc(sizeof(*control), GFP_KERNEL);
@@ -767,7 +781,12 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
                 kfree(control);
                 return -EFAULT;
         }
-        result = snd_ctl_elem_write(file->card, file, control);
+        card = file->card;
+        snd_power_lock(card);
+        result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);
+        if (result >= 0)
+                result = snd_ctl_elem_write(card, file, control);
+        snd_power_unlock(card);
         if (result >= 0)
                 if (copy_to_user(_control, control, sizeof(*control)))
                         result = -EFAULT;