aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2005-05-27 10:07:06 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 10:15:03 +0200
commit8e72ab349e54da49cf3e11480581a3e6704d9553 (patch)
tree926c3390d9bce0926657fb9e77f9ba17fb230f22
parentc3a9cfac750d78241b5dde7d004522f687703b90 (diff)
downloadkernel_samsung_espresso10-8e72ab349e54da49cf3e11480581a3e6704d9553.zip
kernel_samsung_espresso10-8e72ab349e54da49cf3e11480581a3e6704d9553.tar.gz
kernel_samsung_espresso10-8e72ab349e54da49cf3e11480581a3e6704d9553.tar.bz2
[ALSA] Reverted last patch for SNDCTL_DSP_GETOPTR fix & possible overflow fix
ALSA<-OSS emulation This reverts the last patch which wrongly mixes bytes and frames. The real culprit might be the 32-bit overflow, so the return expression uses 64-bit values now in snd_pcm_oss_bytes(). Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--sound/core/oss/pcm_oss.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 6f90dbb..a293982 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -124,13 +124,12 @@ int snd_pcm_plugin_append(snd_pcm_plugin_t *plugin)
static long snd_pcm_oss_bytes(snd_pcm_substream_t *substream, long frames)
{
- long bytes = 0;
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream);
- bytes = frames_to_bytes(runtime, frames);
+ frames = frames_to_bytes(runtime, frames);
if (buffer_size == runtime->oss.buffer_bytes)
- return bytes;
- return (runtime->oss.buffer_bytes * frames) / buffer_size;
+ return frames;
+ return (long)(((int64_t)runtime->oss.buffer_bytes * (int64_t)frames) / (int64_t)buffer_size);
}
static long snd_pcm_alsa_frames(snd_pcm_substream_t *substream, long bytes)