diff options
-rw-r--r-- | drivers/mtd/ubi/attach.c | 3 | ||||
-rw-r--r-- | fs/ubifs/ubifs.c | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index 90fb74a5c9..33c176a77b 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1205,8 +1205,7 @@ static void destroy_ai(struct ubi_attach_info *ai) } } - if (ai->aeb_slab_cache) - kmem_cache_destroy(ai->aeb_slab_cache); + kmem_cache_destroy(ai->aeb_slab_cache); kfree(ai); } diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 8f1c9d167d..4465523d5f 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -462,14 +462,10 @@ out: dbg_gen("cannot find next direntry, error %d", err); out_free: - if (file->private_data) - kfree(file->private_data); - if (file) - free(file); - if (dentry) - free(dentry); - if (dir) - free(dir); + kfree(file->private_data); + free(file); + free(dentry); + free(dir); return ret; } |