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

This commit is contained in:
Tom Rini 2017-11-20 11:46:08 -05:00
commit 69d3226530
2 changed files with 5 additions and 10 deletions

View File

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

View File

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