Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sound_firmware: don't bother with filp_close()

Browse source 
it's opened read-only and never installed into any descriptor tables;
fput() will do just as well.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-04-06 13:53:56 -04:00
parent 264bd6602e
commit 434b5a2e2d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/sound_firmware.c
View file

@ -1,6 +1,7 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/file.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -23,14 +24,14 @@ static int do_mod_firmware_load(const char *fn, char **fp)
if (l <= 0 || l > 131072) if (l <= 0 || l > 131072)
{ {
printk(KERN_INFO "Invalid firmware '%s'\n", fn); printk(KERN_INFO "Invalid firmware '%s'\n", fn);
filp_close(filp, NULL); fput(filp);
return 0; return 0;
} }
dp = vmalloc(l); dp = vmalloc(l);
if (dp == NULL) if (dp == NULL)
{ {
printk(KERN_INFO "Out of memory loading '%s'.\n", fn); printk(KERN_INFO "Out of memory loading '%s'.\n", fn);
filp_close(filp, NULL); fput(filp);
return 0; return 0;
} }
pos = 0; pos = 0;
@ -38,10 +39,10 @@ static int do_mod_firmware_load(const char *fn, char **fp)
{ {
printk(KERN_INFO "Failed to read '%s'.\n", fn); printk(KERN_INFO "Failed to read '%s'.\n", fn);
vfree(dp); vfree(dp);
filp_close(filp, NULL); fput(filp);
return 0; return 0;
} }
filp_close(filp, NULL); fput(filp);
*fp = dp; *fp = dp;
return (int) l; return (int) l;
} }