ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM capture stream (e9ba389c) · Commits · 戴 / test

A PCM capture stream on usb-audio causes a scheduling-while-atomic BUG, as reported in the bugzilla entry below. It's because snd_usb_endpoint_start() is called at first at trigger START for a capture stream, and this function contains the left-over EP deactivation codes. The problem doesn't happen for a playback stream because the function is called at PCM prepare time, which can sleep. This patch fixes the BUG by moving the EP deactivation code into the PCM prepare callback. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=46011 Cc: <stable@vger.kernel.org> [v3.5+] Signed-off-by:

Takashi Iwai <tiwai@suse.de>

sound/usb/endpoint.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -821,10 +821,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)
		if (++ep->use_count != 1)
		return 0;

		/* just to be sure */
		deactivate_urbs(ep, 0, 1);
		wait_clear_urbs(ep);

		ep->active_mask = 0;
		ep->unlink_mask = 0;
		ep->phase = 0;

sound/usb/pcm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -544,6 +544,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
		subs->last_frame_number = 0;
		runtime->delay = 0;

		/* clear the pending deactivation on the target EPs */
		deactivate_endpoints(subs);

		/* for playback, submit the URBs now; otherwise, the first hwptr_done
		* updates for all URBs would happen at the same time when starting */
		if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK)

Admin message