diff options
| author | Takashi Iwai | 2019-01-18 17:37:14 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2019-01-18 17:37:21 +0100 |
| commit | 436ec40e0cdf74eae90af6be6c287396e388f1fb (patch) | |
| tree | ec85647d69d9d2a8f47da48e1ef0175c457c4bcc /sound/pci/oxygen | |
| parent | 053b055948e97268771de11f2ab9b2aa1640b68d (diff) | |
| parent | ce7f93e2bd6f649980846914e4a04ad6ba141fa6 (diff) | |
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/oxygen')
| -rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 6a743c878415..d4cfff7e49e1 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c @@ -744,13 +744,10 @@ static int oxygen_pci_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); struct oxygen *chip = card->private_data; - unsigned int i, saved_interrupt_mask; + unsigned int saved_interrupt_mask; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); - for (i = 0; i < PCM_COUNT; ++i) - snd_pcm_suspend(chip->streams[i]); - if (chip->model.suspend) chip->model.suspend(chip); |