Commit 384dc085 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Avoid unnecessary EP setups in prepare 



The recent fix for USB suspend breakage moved the code to set up EP
from hw_params to prepare, but it means also the EP setup might be
called multiple times unnecessarily because the prepare callback can
be called multiple times without starting the stream (e.g. OSS
emulation).

This patch adds a new flag to struct snd_usb_substream indicating
whether the setup of EP is required, and do it only when necessary,
i.e. right after hw_params or suspend.

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

sound/usb/card.c

+2 −0
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) 
			list_for_each(p, &chip->pcm_list) {

				as = list_entry(p, struct snd_usb_stream, list);

				snd_pcm_suspend_all(as->pcm);

				as->substream[0].need_setup_ep =

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

			}

 		}

	} else {

sound/usb/card.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct snd_usb_substream { 
	struct snd_usb_endpoint *data_endpoint;

	struct snd_usb_endpoint *sync_endpoint;

	unsigned long flags;

	bool need_setup_ep;		/* (re)configure EP at prepare? */



	u64 formats;			/* format bitmasks (all or'ed) */

	unsigned int num_formats;		/* number of supported audio formats (list) */

sound/usb/pcm.c

+7 −3
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, 


	subs->interface = fmt->iface;

	subs->altset_idx = fmt->altset_idx;

	subs->need_setup_ep = true;



	return 0;

}
@@ -568,9 +569,12 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) 
	if (ret < 0)

		return ret;



	if (subs->need_setup_ep) {

		ret = configure_endpoint(subs);

		if (ret < 0)

			return ret;

		subs->need_setup_ep = false;

	}



	/* some unit conversions in runtime */

	subs->data_endpoint->maxframesize =

CRA Git | Maintained and supported by SUSTech CRA and CCSE