From: Clemens Ladisch Date: Mon, 15 Aug 2005 06:25:50 +0000 (+0200) Subject: [ALSA] usb-audio: properly lock hwptr_done accesses X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=daa150ef7d437d17973210f47a1c58623415df94;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git [ALSA] usb-audio: properly lock hwptr_done accesses USB generic driver Take the substream lock when reading hwptr_done to avoid a race condition with the updates in the URB callbacks. Signed-off-by: Clemens Ladisch --- diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 3f7930c0b61..8d4a085f642 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -815,8 +815,14 @@ static int wait_clear_urbs(snd_usb_substream_t *subs) */ static snd_pcm_uframes_t snd_usb_pcm_pointer(snd_pcm_substream_t *substream) { - snd_usb_substream_t *subs = (snd_usb_substream_t *)substream->runtime->private_data; - return subs->hwptr_done; + snd_usb_substream_t *subs; + snd_pcm_uframes_t hwptr_done; + + subs = (snd_usb_substream_t *)substream->runtime->private_data; + spin_lock(&subs->lock); + hwptr_done = subs->hwptr_done; + spin_unlock(&subs->lock); + return hwptr_done; }