From 8495b930b6a520e423ac97cddcfadc64d5133338 Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Tue, 13 Nov 2012 17:12:12 -0500 Subject: [PATCH] --- yaml --- r: 342588 b: refs/heads/master c: 701ef3205eb33bce4ba97b96f6f04a5ae29cd7b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/oss/pcm_plugin.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 558c744b5019..56ee450ae0f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9af4e7fedab490fec6e831912859d6be92e9140d +refs/heads/master: 701ef3205eb33bce4ba97b96f6f04a5ae29cd7b8 diff --git a/trunk/sound/core/oss/pcm_plugin.c b/trunk/sound/core/oss/pcm_plugin.c index f0d7b1566a10..727ac44d39f4 100644 --- a/trunk/sound/core/oss/pcm_plugin.c +++ b/trunk/sound/core/oss/pcm_plugin.c @@ -231,13 +231,14 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pc { struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next; snd_pcm_sframes_t frames; - int stream = snd_pcm_plug_stream(plug); + int stream; if (snd_BUG_ON(!plug)) return -ENXIO; if (clt_frames == 0) return 0; frames = clt_frames; + stream = snd_pcm_plug_stream(plug); if (stream == SNDRV_PCM_STREAM_PLAYBACK) { plugin = snd_pcm_plug_first(plug); while (plugin && frames > 0) {