Re: [PATCH 45/50] sound: usb: usx2y: spin_lock in complete() cleanup
From: Takashi Iwai <hidden>
Date: 2013-07-11 13:49:36
Also in:
alsa-devel, linux-media, linux-wireless, netdev
At Thu, 11 Jul 2013 17:08:30 +0400, Sergei Shtylyov wrote:
On 11-07-2013 13:06, Ming Lei wrote:quoted
Complete() will be run with interrupt enabled, so change to spin_lock_irqsave().Changelog doesn't match the patch.
Yep, but moreover...
quoted
Cc: Jaroslav Kysela <perex-/Fr2/VpizcU@public.gmane.org> Cc: Takashi Iwai <redacted> Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org Signed-off-by: Ming Lei <redacted> --- sound/usb/usx2y/usbusx2yaudio.c | 4 ++++ 1 file changed, 4 insertions(+)quoted
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 4967fe9..e2ee893 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; + + local_irq_save(flags); snd_pcm_stop(subs->pcm_substream, SNDRV_PCM_STATE_XRUN); + local_irq_restore(flags); }
... actually this snd_pcm_stop() call should have been covered by snd_pcm_stream_lock(). Maybe it'd be enough to have a single patch together with the change, i.e. wrapping with snd_pcm_stream_lock_irqsave(). I'll prepare the patch for 3.11 independently from your patch series, so please drop this one. BTW, the word "cleanup" in the subject is inappropriate. This is rather a fix together with the core change. And, I wonder whether we can take a safer approach. When the caller condition changed, we often introduced either a different ops (e.g. ioctl case) or a flag for the new condition, at least during the transition period. Last but not least, is a conversion to tasklet really preferred? tasklet is rather an obsoleted infrastructure nowadays, and people don't recommend to use it any longer, AFAIK. thanks, Takashi -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html