upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / sound / core / pcm_lib.c

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 7434645..4d0b0f7 100644 (file)
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -176,7 +176,7 @@ static inline int snd_pcm_update_hw_ptr_post(snd_pcm_substream_t *substream,
                runtime->avail_max = avail;
        if (avail >= runtime->stop_threshold) {
                if (substream->runtime->status->state == SNDRV_PCM_STATE_DRAINING)
-                       snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
+                       snd_pcm_drain_done(substream);
                else
                        xrun(substream);
                return -EPIPE;
@@ -2660,6 +2660,7 @@ EXPORT_SYMBOL(snd_pcm_hw_param_last);
 EXPORT_SYMBOL(snd_pcm_hw_param_near);
 EXPORT_SYMBOL(snd_pcm_hw_param_set);
 EXPORT_SYMBOL(snd_pcm_hw_refine);
+EXPORT_SYMBOL(snd_pcm_hw_params);
 EXPORT_SYMBOL(snd_pcm_hw_constraints_init);
 EXPORT_SYMBOL(snd_pcm_hw_constraints_complete);
 EXPORT_SYMBOL(snd_pcm_hw_constraint_list);