diff --git a/[refs] b/[refs] index 9b2fbdbbd6f5..669f74a64899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20818a0caa84adbfe2f1e9c0e036f5b09a9692a2 +refs/heads/master: 586093064d95618cc9ba2acd546949eea9f2a8fa diff --git a/trunk/sound/sound_firmware.c b/trunk/sound/sound_firmware.c index 7e96249536b4..37711a5d0d6b 100644 --- a/trunk/sound/sound_firmware.c +++ b/trunk/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); - 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); - filp_close(filp, current->files); + filp_close(filp, NULL); 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); - filp_close(filp, current->files); + filp_close(filp, NULL); return 0; } - filp_close(filp, current->files); + filp_close(filp, NULL); *fp = dp; return (int) l; }