From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042853.813273255@goodmis.org> Date: Wed, 11 Sep 2013 00:27:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai Subject: [010/251] ALSA: usx2y: Fix unlocked snd_pcm_stop() call References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0010-ALSA-usx2y-Fix-unlocked-snd_pcm_stop-call.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai [ Upstream commit 5be1efb4c2ed79c3d7c0cbcbecae768377666e84 ] snd_pcm_stop() must be called in the PCM substream lock context. Cc: Signed-off-by: Takashi Iwai Signed-off-by: Steven Rostedt --- sound/usb/usx2y/usbusx2yaudio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 520ef96..43d337d 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -273,7 +273,11 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y) struct snd_usX2Y_substream *subs = usX2Y->subs[s]; if (subs) { if (atomic_read(&subs->state) >= state_PRERUNNING) { + unsigned long flags; + + snd_pcm_stream_lock_irqsave(subs->pcm_substream, flags); snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock_irqrestore(subs->pcm_substream, flags); } for (u = 0; u < NRURBS; u++) { struct urb *urb = subs->urb[u]; -- 1.7.10.4