diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-01-18 17:37:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-01-18 17:37:21 +0100 |
commit | 436ec40e0cdf74eae90af6be6c287396e388f1fb (patch) | |
tree | ec85647d69d9d2a8f47da48e1ef0175c457c4bcc /sound/pci/sis7019.c | |
parent | 053b055948e97268771de11f2ab9b2aa1640b68d (diff) | |
parent | ce7f93e2bd6f649980846914e4a04ad6ba141fa6 (diff) | |
download | linux-stable-436ec40e0cdf74eae90af6be6c287396e388f1fb.tar.gz linux-stable-436ec40e0cdf74eae90af6be6c287396e388f1fb.tar.bz2 linux-stable-436ec40e0cdf74eae90af6be6c287396e388f1fb.zip |
Merge branch 'topic/pcm-device-suspend' into for-next
Pull the PCM suspend improvement / cleanup.
This moves the most of snd_pcm_suspend*() calls into PCM's own device
PM ops. There should be no change from the functionality POV.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/sis7019.c')
-rw-r--r-- | sound/pci/sis7019.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 964acf302479..6b27980d77a8 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1214,7 +1214,6 @@ static int sis_suspend(struct device *dev) int i; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); - snd_pcm_suspend_all(sis->pcm); if (sis->codecs_present & SIS_PRIMARY_CODEC_PRESENT) snd_ac97_suspend(sis->ac97[0]); if (sis->codecs_present & SIS_SECONDARY_CODEC_PRESENT) |