diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-07-19 18:26:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:18:52 -0700 |
| commit | 2d4fe72b277dde96b6cb765b13689d98ee759a5f (patch) | |
| tree | c0b7db8e8f9dd7a4df030041e0a3b9ff8ec49cb3 /sound | |
| parent | 9cfe5af116d3c10595733f11681399f5d80980f6 (diff) | |
| download | kernel_samsung_smdk4412-2d4fe72b277dde96b6cb765b13689d98ee759a5f.tar.gz kernel_samsung_smdk4412-2d4fe72b277dde96b6cb765b13689d98ee759a5f.tar.bz2 kernel_samsung_smdk4412-2d4fe72b277dde96b6cb765b13689d98ee759a5f.zip | |
ALSA: usb-audio: 6fire: return correct XRUN indication
commit be2f93a4c4981b3646b6f98f477154411b8516cb upstream.
Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of
SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer
function of 6fire, as expected by snd_pcm_update_hw_ptr0().
Caught by sparse.
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/6fire/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c index d144cdb2f15..d2fb012cd57 100644 --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c @@ -541,7 +541,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer( snd_pcm_uframes_t ret; if (rt->panic || !sub) - return SNDRV_PCM_STATE_XRUN; + return SNDRV_PCM_POS_XRUN; spin_lock_irqsave(&sub->lock, flags); ret = sub->dma_off; |