Merge branch 'master' into upstream

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/file.c b/fs/file.c
index b3c6b82e6a9d..8d3bfca7714b 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -281,10 +281,8 @@ static struct fdtable *alloc_fdtable(int nr)
 out2:
         nfds = fdt->max_fdset;
 out:
-        if (new_openset)
-                free_fdset(new_openset, nfds);
-        if (new_execset)
-                free_fdset(new_execset, nfds);
+        free_fdset(new_openset, nfds);
+        free_fdset(new_execset, nfds);
         kfree(fdt);
         return NULL;
 }