Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index b71be579c6ecb3a5775d4a48e93adad8f530d2dc..01a5e05ede95cddbbcaa6be3ddb4bcf13e3786ce 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2428,6 +2428,7 @@ static int snd_pcm_hwsync(struct snd_pcm_substream *substream)
        case SNDRV_PCM_STATE_DRAINING:
                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                        goto __badfd;
+               /* Fall through */
        case SNDRV_PCM_STATE_RUNNING:
                if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
                        break;
@@ -2460,6 +2461,7 @@ static int snd_pcm_delay(struct snd_pcm_substream *substream,
        case SNDRV_PCM_STATE_DRAINING:
                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                        goto __badfd;
+               /* Fall through */
        case SNDRV_PCM_STATE_RUNNING:
                if ((err = snd_pcm_update_hw_ptr(substream)) < 0)
                        break;