diff --git a/[refs] b/[refs] index f14b2d90f5e8..77430d1ce966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b87819b61060a3d32d5982f5ee998c22ab8ca27 +refs/heads/master: 0fbf405c583e6ee6d7227eb938a096d0998f7e78 diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index a998f88e3f30..9e495244eee2 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -1469,8 +1469,6 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream) } } up_read(&snd_pcm_link_rwsem); - if (! num_drecs) - goto _error; snd_pcm_stream_lock_irq(substream); /* resume pause */