diff options
| author | Tom Rini <[email protected]> | 2017-11-20 11:46:08 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-11-20 11:46:08 -0500 |
| commit | 69d3226530a0bb4945644778b903c5b95d858e30 (patch) | |
| tree | f643335c7a0b1a8a5bd4eb0e7c31d7a31485d35d | |
| parent | 56d5a10f3ade93f5065f9299cb06503dc4194365 (diff) | |
| parent | cd5f33e5fc832effd70866fccd629046a6dac265 (diff) | |
Merge git://git.denx.de/u-boot-ubi
| -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 90fb74a5c96..33c176a77bd 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 8f1c9d167d7..4465523d5fb 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; } |