[PATCH] staging: android: check for error from register_shrinker in ion_heap_init_shrinker

[Xiongwei Song]

The function register_shrinker in ion_heap_init_shrinker may return an
error, check it out. Meanwhile, ion_heap_init_shrinker has to a return
value.

Signed-off-by: Xiongwei Song <sxwj...@gmail.com>
---
 drivers/staging/android/ion/ion.c      | 8 ++++++--
 drivers/staging/android/ion/ion.h      | 2 +-
 drivers/staging/android/ion/ion_heap.c | 5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c 
b/drivers/staging/android/ion/ion.c
index bb2c4b07badd..57e0d8035b2e 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -529,6 +529,7 @@ void ion_device_add_heap(struct ion_heap *heap)
 {
        struct dentry *debug_file;
        struct ion_device *dev = internal_dev;
+       int ret;
 
        if (!heap->ops->allocate || !heap->ops->free)
                pr_err("%s: can not add heap with invalid ops struct.\n",
@@ -540,8 +541,11 @@ void ion_device_add_heap(struct ion_heap *heap)
        if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)
                ion_heap_init_deferred_free(heap);
 
-       if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink)
-               ion_heap_init_shrinker(heap);
+       if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink) {
+               ret = ion_heap_init_shrinker(heap);
+               if (ret)
+                       pr_err("%s: Failed to register shrinker\n", __func__);
+       }
 
        heap->dev = dev;
        down_write(&dev->lock);
diff --git a/drivers/staging/android/ion/ion.h 
b/drivers/staging/android/ion/ion.h
index c24c6e230654..a238f23c9116 100644
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -230,7 +230,7 @@ int ion_alloc(size_t len,
  * this function will be called to setup a shrinker to shrink the freelists
  * and call the heap's shrink op.
  */
-void ion_heap_init_shrinker(struct ion_heap *heap);
+int ion_heap_init_shrinker(struct ion_heap *heap);
 
 /**
  * ion_heap_init_deferred_free -- initialize deferred free functionality
diff --git a/drivers/staging/android/ion/ion_heap.c 
b/drivers/staging/android/ion/ion_heap.c
index 2af86a2d94fb..772dad65396e 100644
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -297,11 +297,12 @@ static unsigned long ion_heap_shrink_scan(struct shrinker 
*shrinker,
        return freed;
 }
 
-void ion_heap_init_shrinker(struct ion_heap *heap)
+int ion_heap_init_shrinker(struct ion_heap *heap)
 {
        heap->shrinker.count_objects = ion_heap_shrink_count;
        heap->shrinker.scan_objects = ion_heap_shrink_scan;
        heap->shrinker.seeks = DEFAULT_SEEKS;
        heap->shrinker.batch = 0;
-       register_shrinker(&heap->shrinker);
+
+       return register_shrinker(&heap->shrinker);
 }
-- 
2.15.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel