Merge branch 'upstream'

[powerpc.git] / sound / core / control.c

diff --git a/sound/core/control.c b/sound/core/control.c
index 5747453..22565c9 100644 (file)
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -664,7 +664,7 @@ static int snd_ctl_elem_info_user(struct snd_ctl_file *ctl,
        if (copy_from_user(&info, _info, sizeof(info)))
                return -EFAULT;
        snd_power_lock(ctl->card);
-       result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0, NULL);
+       result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);
        if (result >= 0)
                result = snd_ctl_elem_info(ctl, &info);
        snd_power_unlock(ctl->card);
@@ -718,7 +718,7 @@ static int snd_ctl_elem_read_user(struct snd_card *card,
                return -EFAULT;
        }
        snd_power_lock(card);
-       result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);
+       result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
        if (result >= 0)
                result = snd_ctl_elem_read(card, control);
        snd_power_unlock(card);
@@ -783,7 +783,7 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
        }
        card = file->card;
        snd_power_lock(card);
-       result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);
+       result = snd_power_wait(card, SNDRV_CTL_POWER_D0);
        if (result >= 0)
                result = snd_ctl_elem_write(card, file, control);
        snd_power_unlock(card);