diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-06 13:53:56 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 15:16:32 -0400 |
| commit | 434b5a2e2dfd2a15bde68ed7ed2d4150eceb04e0 (patch) | |
| tree | 754fa40cbd8516d1118177cecbe17ede62570a14 | |
| parent | 264bd6602edd9f309c67685770bc1c8103699428 (diff) | |
| download | linux-3.10-434b5a2e2dfd2a15bde68ed7ed2d4150eceb04e0.tar.gz linux-3.10-434b5a2e2dfd2a15bde68ed7ed2d4150eceb04e0.tar.bz2 linux-3.10-434b5a2e2dfd2a15bde68ed7ed2d4150eceb04e0.zip | |
sound_firmware: don't bother with filp_close()
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>
| -rw-r--r-- | sound/sound_firmware.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c index e1490346805..b155137ee31 100644 --- a/sound/sound_firmware.c +++ b/sound/sound_firmware.c @@ -1,6 +1,7 @@ #include <linux/vmalloc.h> #include <linux/module.h> #include <linux/fs.h> +#include <linux/file.h> #include <linux/mm.h> #include <linux/sched.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) { printk(KERN_INFO "Invalid firmware '%s'\n", fn); - filp_close(filp, NULL); + fput(filp); return 0; } dp = vmalloc(l); if (dp == NULL) { printk(KERN_INFO "Out of memory loading '%s'.\n", fn); - filp_close(filp, NULL); + fput(filp); return 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); vfree(dp); - filp_close(filp, NULL); + fput(filp); return 0; } - filp_close(filp, NULL); + fput(filp); *fp = dp; return (int) l; } |