aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss/pcm_oss.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
-rw-r--r--sound/core/oss/pcm_oss.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index f8d4a419f3af..467039b342b5 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1062,8 +1062,8 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)
1062 runtime->oss.channels = params_channels(params); 1062 runtime->oss.channels = params_channels(params);
1063 runtime->oss.rate = params_rate(params); 1063 runtime->oss.rate = params_rate(params);
1064 1064
1065 vfree(runtime->oss.buffer); 1065 kvfree(runtime->oss.buffer);
1066 runtime->oss.buffer = vmalloc(runtime->oss.period_bytes); 1066 runtime->oss.buffer = kvzalloc(runtime->oss.period_bytes, GFP_KERNEL);
1067 if (!runtime->oss.buffer) { 1067 if (!runtime->oss.buffer) {
1068 err = -ENOMEM; 1068 err = -ENOMEM;
1069 goto failure; 1069 goto failure;
@@ -2328,7 +2328,7 @@ static void snd_pcm_oss_release_substream(struct snd_pcm_substream *substream)
2328{ 2328{
2329 struct snd_pcm_runtime *runtime; 2329 struct snd_pcm_runtime *runtime;
2330 runtime = substream->runtime; 2330 runtime = substream->runtime;
2331 vfree(runtime->oss.buffer); 2331 kvfree(runtime->oss.buffer);
2332 runtime->oss.buffer = NULL; 2332 runtime->oss.buffer = NULL;
2333#ifdef CONFIG_SND_PCM_OSS_PLUGINS 2333#ifdef CONFIG_SND_PCM_OSS_PLUGINS
2334 snd_pcm_oss_plugin_clear(substream); 2334 snd_pcm_oss_plugin_clear(substream);