projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'slab/next' into slab/for-linus
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
sound
/
sound_firmware.c
diff --git
a/sound/sound_firmware.c
b/sound/sound_firmware.c
index
7e96249
..
37711a5
100644
(file)
--- a/
sound/sound_firmware.c
+++ b/
sound/sound_firmware.c
@@
-23,14
+23,14
@@
static int do_mod_firmware_load(const char *fn, char **fp)
if (l <= 0 || l > 131072)
{
printk(KERN_INFO "Invalid firmware '%s'\n", fn);
if (l <= 0 || l > 131072)
{
printk(KERN_INFO "Invalid firmware '%s'\n", fn);
- filp_close(filp,
current->files
);
+ filp_close(filp,
NULL
);
return 0;
}
dp = vmalloc(l);
if (dp == NULL)
{
printk(KERN_INFO "Out of memory loading '%s'.\n", fn);
return 0;
}
dp = vmalloc(l);
if (dp == NULL)
{
printk(KERN_INFO "Out of memory loading '%s'.\n", fn);
- filp_close(filp,
current->files
);
+ filp_close(filp,
NULL
);
return 0;
}
pos = 0;
return 0;
}
pos = 0;
@@
-38,10
+38,10
@@
static int do_mod_firmware_load(const char *fn, char **fp)
{
printk(KERN_INFO "Failed to read '%s'.\n", fn);
vfree(dp);
{
printk(KERN_INFO "Failed to read '%s'.\n", fn);
vfree(dp);
- filp_close(filp,
current->files
);
+ filp_close(filp,
NULL
);
return 0;
}
return 0;
}
- filp_close(filp,
current->files
);
+ filp_close(filp,
NULL
);
*fp = dp;
return (int) l;
}
*fp = dp;
return (int) l;
}