register_shrinker call is made in ashmem_init, it may return error code,
so we need to check it.

Signed-off-by: Xiongwei Song <sxwj...@gmail.com>
---
v1->v2: remove unlikely()
---
 drivers/staging/android/ashmem.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 4e8947923904..5d7aa55efb22 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -854,12 +854,18 @@ static int __init ashmem_init(void)
                goto out_free2;
        }
 
-       register_shrinker(&ashmem_shrinker);
+       ret = register_shrinker(&ashmem_shrinker);
+       if (ret) {
+               pr_err("failed to register shrinker!\n");
+               goto out_demisc;
+       }
 
        pr_info("initialized\n");
 
        return 0;
 
+out_demisc:
+       misc_deregister(&ashmem_misc);
 out_free2:
        kmem_cache_destroy(ashmem_range_cachep);
 out_free1:
-- 
2.15.1

Reply via email to