From 3c74561d831b7d89a3bab0f887f50e767021b549 Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Tue, 13 Nov 2012 17:12:11 -0500 Subject: [PATCH] --- yaml --- r: 342587 b: refs/heads/master c: 9af4e7fedab490fec6e831912859d6be92e9140d h: refs/heads/master i: 342585: 815a2dc7d7d0f175ff9c69c2703ba809d76f945d 342583: 2206a778461fb6783b04be770e9be5fa80341a79 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 d8250c3370c6..558c744b5019 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1762a59d8e8b5e99f6f4a0f292b40f3cacb108ba +refs/heads/master: 9af4e7fedab490fec6e831912859d6be92e9140d diff --git a/trunk/sound/core/oss/pcm_plugin.c b/trunk/sound/core/oss/pcm_plugin.c index 71cc3ddf5c15..f0d7b1566a10 100644 --- a/trunk/sound/core/oss/pcm_plugin.c +++ b/trunk/sound/core/oss/pcm_plugin.c @@ -199,12 +199,13 @@ int snd_pcm_plugin_free(struct snd_pcm_plugin *plugin) snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_pcm_uframes_t drv_frames) { struct snd_pcm_plugin *plugin, *plugin_prev, *plugin_next; - int stream = snd_pcm_plug_stream(plug); + int stream; if (snd_BUG_ON(!plug)) return -ENXIO; if (drv_frames == 0) return 0; + stream = snd_pcm_plug_stream(plug); if (stream == SNDRV_PCM_STREAM_PLAYBACK) { plugin = snd_pcm_plug_last(plug); while (plugin && drv_frames > 0) {