git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
include
/
sound
/
pcm_oss.h
diff --git
a/include/sound/pcm_oss.h
b/include/sound/pcm_oss.h
index
c854647
..
cc4e226
100644
(file)
--- a/
include/sound/pcm_oss.h
+++ b/
include/sound/pcm_oss.h
@@
-3,7
+3,7
@@
/*
* Digital Audio (PCM) - OSS compatibility abstract layer
/*
* Digital Audio (PCM) - OSS compatibility abstract layer
- * Copyright (c) by Jaroslav Kysela <perex@
suse
.cz>
+ * Copyright (c) by Jaroslav Kysela <perex@
perex
.cz>
*
*
* This program is free software; you can redistribute it and/or modify
*
*
* This program is free software; you can redistribute it and/or modify
@@
-56,6
+56,7
@@
struct snd_pcm_oss_runtime {
size_t mmap_bytes;
char *buffer; /* vmallocated period */
size_t buffer_used; /* used length from period buffer */
size_t mmap_bytes;
char *buffer; /* vmallocated period */
size_t buffer_used; /* used length from period buffer */
+ struct mutex params_lock;
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
struct snd_pcm_plugin *plugin_first;
struct snd_pcm_plugin *plugin_last;
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
struct snd_pcm_plugin *plugin_first;
struct snd_pcm_plugin *plugin_last;