staging: android: ashmem.c: destroy slabs when init fails

when ashmem init fails, destroy the slabs, leave
no garbage.

Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 3f2a3d611e4bea033b7943085f4fef747112be89..5bb1283d19cd2c0b697d11cd2b03dbaa71ca57b7 100644 (file)
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -831,14 +831,14 @@ static struct miscdevice ashmem_misc = {
 
 static int __init ashmem_init(void)
 {
-       int ret;
+       int ret = -ENOMEM;
 
        ashmem_area_cachep = kmem_cache_create("ashmem_area_cache",
                                               sizeof(struct ashmem_area),
                                               0, 0, NULL);
        if (unlikely(!ashmem_area_cachep)) {
                pr_err("failed to create slab cache\n");
-               return -ENOMEM;
+               goto out;
        }
 
        ashmem_range_cachep = kmem_cache_create("ashmem_range_cache",
@@ -846,13 +846,13 @@ static int __init ashmem_init(void)
                                                0, 0, NULL);
        if (unlikely(!ashmem_range_cachep)) {
                pr_err("failed to create slab cache\n");
-               return -ENOMEM;
+               goto out_free1;
        }
 
        ret = misc_register(&ashmem_misc);
        if (unlikely(ret)) {
                pr_err("failed to register misc device!\n");
-               return ret;
+               goto out_free2;
        }
 
        register_shrinker(&ashmem_shrinker);
@@ -860,5 +860,12 @@ static int __init ashmem_init(void)
        pr_info("initialized\n");
 
        return 0;
+
+out_free2:
+       kmem_cache_destroy(ashmem_range_cachep);
+out_free1:
+       kmem_cache_destroy(ashmem_area_cachep);
+out:
+       return ret;
 }
 device_initcall(ashmem_init);