diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
| commit | 127470597b6b9466872d9794a80804ec95fff8ea (patch) | |
| tree | b0087938a7f980c5b3d3879e0c2d18bab45d78e8 /sound/arm/pxa2xx-ac97.c | |
| parent | 3789debfc379ac84b90e2db32d7a6b66d28a2c7c (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| download | linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.gz linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.bz2 linux-127470597b6b9466872d9794a80804ec95fff8ea.zip | |
Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
Diffstat (limited to 'sound/arm/pxa2xx-ac97.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 1f72672262d0..68fe5bb11eea 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -124,7 +124,6 @@ static int pxa2xx_ac97_do_suspend(struct snd_card *card) pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data; snd_power_change_state(card, SNDRV_CTL_POWER_D3cold); - snd_pcm_suspend_all(pxa2xx_ac97_pcm); snd_ac97_suspend(pxa2xx_ac97_ac97); if (platform_ops && platform_ops->suspend) platform_ops->suspend(platform_ops->priv); |