diff --git a/[refs] b/[refs] index 66934e68ebd2..ae371c343baf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 264bd6602edd9f309c67685770bc1c8103699428 +refs/heads/master: 434b5a2e2dfd2a15bde68ed7ed2d4150eceb04e0 diff --git a/trunk/sound/sound_firmware.c b/trunk/sound/sound_firmware.c index e14903468051..b155137ee312 100644 --- a/trunk/sound/sound_firmware.c +++ b/trunk/sound/sound_firmware.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -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; }