diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-07 19:08:28 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-09 20:20:40 +0300 |
| commit | 1fb8510cdb5b7befe8a59f533c7fc12ef0dac73e (patch) | |
| tree | b44569425ea7683d02893cfd145081a11d7677f1 /sound/usb/usx2y | |
| parent | 31584ed18c073176a7ad96ddbfd09765e21e813d (diff) | |
| download | linux-1fb8510cdb5b7befe8a59f533c7fc12ef0dac73e.tar.xz | |
ALSA: pcm: Add snd_pcm_stop_xrun() helper
Add a new helper function snd_pcm_stop_xrun() to the standard sequnce
lock/snd_pcm_stop(XRUN)/unlock by a single call, and replace the
existing open codes with this helper.
The function checks the PCM running state to prevent setting the wrong
state, too, for more safety.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usx2y')
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index a63330dd1407..61d5dc2a3421 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -272,13 +272,8 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y) for (s = 0; s < 4; s++) { 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); - } + if (atomic_read(&subs->state) >= state_PRERUNNING) + snd_pcm_stop_xrun(subs->pcm_substream); for (u = 0; u < NRURBS; u++) { struct urb *urb = subs->urb[u]; if (NULL != urb) |