Commit 0662292a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Handle normal and auto-suspend equally 



In theory, the device may get suspended even at runtime PM suspend.
Currently we don't save the mixer state for autopm, and it may bring
inconsistency.

This patch removes the special handling for autosuspend.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a6da499b

sound/usb/card.c

+10 −20
Original line number Diff line number Diff line
@@ -689,7 +689,8 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) 
	if (chip == (void *)-1L)

		return 0;



	if (!PMSG_IS_AUTO(message)) {

	chip->autosuspended = !!PMSG_IS_AUTO(message);

	if (!chip->autosuspended)

		snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);

	if (!chip->num_suspended_intf++) {

		list_for_each_entry(as, &chip->pcm_list, list) {
@@ -697,22 +698,11 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) 
			as->substream[0].need_setup_ep =

				as->substream[1].need_setup_ep = true;

		}

			list_for_each(p, &chip->midi_list) {

		list_for_each(p, &chip->midi_list)

			snd_usbmidi_suspend(p);

			}

		}

	} else {

		/*

		 * otherwise we keep the rest of the system in the dark

		 * to keep this transparent

		 */

		if (!chip->num_suspended_intf++)

			chip->autosuspended = 1;

	}



	if (chip->num_suspended_intf == 1)

		list_for_each_entry(mixer, &chip->mixer_list, list)

			snd_usb_mixer_suspend(mixer);

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE