git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/beep-rename' into topic/core-change
[safe/jmp/linux-2.6]
/
sound
/
oss
/
msnd.c
diff --git
a/sound/oss/msnd.c
b/sound/oss/msnd.c
index
4f1ff1b
..
21eb6dc
100644
(file)
--- a/
sound/oss/msnd.c
+++ b/
sound/oss/msnd.c
@@
-20,11
+20,8
@@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: msnd.c,v 1.17 1999/03/21 16:50:09 andrewtv Exp $
- *
********************************************************************/
********************************************************************/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@
-48,7
+45,7
@@
static multisound_dev_t *devs[MSND_MAX_DEVS];
static int num_devs;
static multisound_dev_t *devs[MSND_MAX_DEVS];
static int num_devs;
-int
__init
msnd_register(multisound_dev_t *dev)
+int msnd_register(multisound_dev_t *dev)
{
int i;
{
int i;
@@
-96,16
+93,14
@@
void msnd_fifo_init(msnd_fifo *f)
void msnd_fifo_free(msnd_fifo *f)
{
void msnd_fifo_free(msnd_fifo *f)
{
- if (f->data) {
- vfree(f->data);
- f->data = NULL;
- }
+ vfree(f->data);
+ f->data = NULL;
}
int msnd_fifo_alloc(msnd_fifo *f, size_t n)
{
msnd_fifo_free(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;
f->n = n;
f->tail = 0;
f->head = 0;