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
This commit was generated by cvs2svn to compensate for changes in r632,
[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
4d84f25
..
db5eb8b
100644
(file)
--- a/
sound/isa/sb/emu8000_pcm.c
+++ b/
sound/isa/sb/emu8000_pcm.c
@@
-23,8
+23,6
@@
#include <sound/initval.h>
#include <sound/pcm.h>
#include <sound/initval.h>
#include <sound/pcm.h>
-#define chip_t emu8000_t
-
/*
* define the following if you want to use this pcm with non-interleaved mode
*/
/*
* define the following if you want to use this pcm with non-interleaved mode
*/
@@
-235,7
+233,7
@@
static int emu8k_pcm_open(snd_pcm_substream_t *subs)
emu8k_pcm_t *rec;
snd_pcm_runtime_t *runtime = subs->runtime;
emu8k_pcm_t *rec;
snd_pcm_runtime_t *runtime = subs->runtime;
- rec =
snd_kcalloc(
sizeof(*rec), GFP_KERNEL);
+ rec =
kcalloc(1,
sizeof(*rec), GFP_KERNEL);
if (! rec)
return -ENOMEM;
if (! rec)
return -ENOMEM;
@@
-262,9
+260,8
@@
static int emu8k_pcm_open(snd_pcm_substream_t *subs)
static int emu8k_pcm_close(snd_pcm_substream_t *subs)
{
emu8k_pcm_t *rec = subs->runtime->private_data;
static int emu8k_pcm_close(snd_pcm_substream_t *subs)
{
emu8k_pcm_t *rec = subs->runtime->private_data;
- if (rec)
- kfree(rec);
- subs->runtime->private_data = 0;
+ kfree(rec);
+ subs->runtime->private_data = NULL;
return 0;
}
return 0;
}