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/usb | |
| parent | 053b055948e97268771de11f2ab9b2aa1640b68d (diff) | |
| parent | ce7f93e2bd6f649980846914e4a04ad6ba141fa6 (diff) | |
| download | linux-436ec40e0cdf74eae90af6be6c287396e388f1fb.tar.bz2 | |
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/usb')
| -rw-r--r-- | sound/usb/card.c | 1 | ||||
| -rw-r--r-- | sound/usb/line6/driver.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 746a72e23cf9..719e10034553 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -811,7 +811,6 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); if (!chip->num_suspended_intf++) { list_for_each_entry(as, &chip->pcm_list, list) { - snd_pcm_suspend_all(as->pcm); snd_usb_pcm_suspend(as); as->substream[0].need_setup_ep = as->substream[1].need_setup_ep = true; diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index c1376bfdc90b..7afe8fae4939 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -849,10 +849,8 @@ int line6_suspend(struct usb_interface *interface, pm_message_t message) if (line6->properties->capabilities & LINE6_CAP_CONTROL) line6_stop_listen(line6); - if (line6pcm != NULL) { - snd_pcm_suspend_all(line6pcm->pcm); + if (line6pcm != NULL) line6pcm->flags = 0; - } return 0; } |