From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 Nov 2017 16:46:08 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-ubi
X-Git-Tag: v2018.01-rc1~87
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=69d3226530a0bb4945644778b903c5b95d858e30;hp=56d5a10f3ade93f5065f9299cb06503dc4194365;p=u-boot

Merge git://git.denx.de/u-boot-ubi
---

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;
 }