diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
| commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
| tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/soc | |
| parent | ALSA: hda: Fix regression of hdmi eld control created based on invalid pcm (diff) | |
| parent | ALSA: ctxfi: Remove null check before kfree (diff) | |
| download | linux-dev-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.xz linux-dev-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 13c875e2392a..62c11e26ce5c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -653,9 +653,7 @@ int snd_soc_suspend(struct device *dev) /* Due to the resume being scheduled into a workqueue we could * suspend before that's finished - wait for it to complete. */ - snd_power_lock(card->snd_card); snd_power_wait(card->snd_card, SNDRV_CTL_POWER_D0); - snd_power_unlock(card->snd_card); /* we're going to block userspace touching us until resume completes */ snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D3hot); |