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
[PATCH] kfree cleanup: arch
[pandora-kernel.git]
/
arch
/
ppc
/
8xx_io
/
cs4218_tdm.c
diff --git
a/arch/ppc/8xx_io/cs4218_tdm.c
b/arch/ppc/8xx_io/cs4218_tdm.c
index
2ca9ec7
..
49eb2a7
100644
(file)
--- a/
arch/ppc/8xx_io/cs4218_tdm.c
+++ b/
arch/ppc/8xx_io/cs4218_tdm.c
@@
-318,7
+318,7
@@
struct cs_sound_settings {
static struct cs_sound_settings sound;
static struct cs_sound_settings sound;
-static void *CS_Alloc(unsigned int size,
in
t flags);
+static void *CS_Alloc(unsigned int size,
gfp_
t flags);
static void CS_Free(void *ptr, unsigned int size);
static int CS_IrqInit(void);
#ifdef MODULE
static void CS_Free(void *ptr, unsigned int size);
static int CS_IrqInit(void);
#ifdef MODULE
@@
-959,7
+959,7
@@
static TRANS transCSNormalRead = {
/*** Low level stuff *********************************************************/
/*** Low level stuff *********************************************************/
-static void *CS_Alloc(unsigned int size,
in
t flags)
+static void *CS_Alloc(unsigned int size,
gfp_
t flags)
{
int order;
{
int order;
@@
-1013,8
+1013,7
@@
static void CS_IrqCleanup(void)
*/
cpm_free_handler(CPMVEC_SMC2);
*/
cpm_free_handler(CPMVEC_SMC2);
- if (beep_buf)
- kfree(beep_buf);
+ kfree(beep_buf);
kd_mksound = orig_mksound;
}
#endif /* MODULE */
kd_mksound = orig_mksound;
}
#endif /* MODULE */