diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-05-25 08:50:03 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-05-25 08:50:03 +0200 |
| commit | f20fdd4362e31a02c24048af2eca735b59dacf78 (patch) | |
| tree | bae1e962be6d441163aa5cfb29e4d3b34bd51343 /sound/core/control_compat.c | |
| parent | 13d11f14ae40ecc9001f9ac6287b4c6db52fe48d (diff) | |
| parent | 534a427bface78d682482ad66ce1a517522acc1d (diff) | |
Merge branch 'topic/pci-rescan-prep-v2' into for-next
Pull PCI rescan prep work.
Link: https://lore.kernel.org/r/20210523090920.15345-1-tiwai@suse.de
Diffstat (limited to 'sound/core/control_compat.c')
| -rw-r--r-- | sound/core/control_compat.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index 1d708aab9c98..470dabc60aa0 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -96,9 +96,6 @@ static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl, if (get_user(data->value.enumerated.item, &data32->value.enumerated.item)) goto error; - err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0); - if (err < 0) - goto error; err = snd_ctl_elem_info(ctl, data); if (err < 0) goto error; @@ -187,7 +184,10 @@ static int get_ctl_type(struct snd_card *card, struct snd_ctl_elem_id *id, return -ENOMEM; } info->id = *id; - err = kctl->info(kctl, info); + err = snd_power_ref_and_wait(card); + if (!err) + err = kctl->info(kctl, info); + snd_power_unref(card); up_read(&card->controls_rwsem); if (err >= 0) { err = info->type; @@ -298,9 +298,6 @@ static int ctl_elem_read_user(struct snd_card *card, if (err < 0) goto error; - err = snd_power_wait(card, SNDRV_CTL_POWER_D0); - if (err < 0) - goto error; err = snd_ctl_elem_read(card, data); if (err < 0) goto error; @@ -326,9 +323,6 @@ static int ctl_elem_write_user(struct snd_ctl_file *file, if (err < 0) goto error; - err = snd_power_wait(card, SNDRV_CTL_POWER_D0); - if (err < 0) - goto error; err = snd_ctl_elem_write(card, file, data); if (err < 0) goto error; |