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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
sound
/
oss
/
msnd.c
diff --git
a/sound/oss/msnd.c
b/sound/oss/msnd.c
index
e4282d9
..
21eb6dc
100644
(file)
--- a/
sound/oss/msnd.c
+++ b/
sound/oss/msnd.c
@@
-100,7
+100,7
@@
void msnd_fifo_free(msnd_fifo *f)
int msnd_fifo_alloc(msnd_fifo *f, size_t n)
{
msnd_fifo_free(f);
- f->data =
(char *)
vmalloc(n);
+ f->data = vmalloc(n);
f->n = n;
f->tail = 0;
f->head = 0;