git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
sound
/
isa
/
sb
/
emu8000_pcm.c
diff --git
a/sound/isa/sb/emu8000_pcm.c
b/sound/isa/sb/emu8000_pcm.c
index
51e4f20
..
5c4def8
100644
(file)
--- a/
sound/isa/sb/emu8000_pcm.c
+++ b/
sound/isa/sb/emu8000_pcm.c
@@
-264,7
+264,7
@@
static int emu8k_pcm_close(snd_pcm_substream_t *subs)
emu8k_pcm_t *rec = subs->runtime->private_data;
if (rec)
kfree(rec);
emu8k_pcm_t *rec = subs->runtime->private_data;
if (rec)
kfree(rec);
- subs->runtime->private_data =
0
;
+ subs->runtime->private_data =
NULL
;
return 0;
}
return 0;
}
@@
-515,12
+515,12
@@
static int emu8k_pcm_silence(snd_pcm_substream_t *subs,
static int emu8k_pcm_copy(snd_pcm_substream_t *subs,
int voice,
snd_pcm_uframes_t pos,
static int emu8k_pcm_copy(snd_pcm_substream_t *subs,
int voice,
snd_pcm_uframes_t pos,
- void *src,
+ void
__user
*src,
snd_pcm_uframes_t count)
{
emu8k_pcm_t *rec = subs->runtime->private_data;
emu8000_t *emu = rec->emu;
snd_pcm_uframes_t count)
{
emu8k_pcm_t *rec = subs->runtime->private_data;
emu8000_t *emu = rec->emu;
- unsigned short *buf = src;
+ unsigned short
__user
*buf = src;
snd_emu8000_write_wait(emu, 1);
EMU8000_SMALW_WRITE(emu, pos + rec->loop_start[0]);
snd_emu8000_write_wait(emu, 1);
EMU8000_SMALW_WRITE(emu, pos + rec->loop_start[0]);