From: Roman Kiryanov <r...@google.com>

This way deinit will have a chance to report an error.

Signed-off-by: Roman Kiryanov <r...@google.com>
---
 drivers/platform/goldfish/goldfish_pipe_v2.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/goldfish/goldfish_pipe_v2.c 
b/drivers/platform/goldfish/goldfish_pipe_v2.c
index ccde28abcb24..7187b2e603d4 100644
--- a/drivers/platform/goldfish/goldfish_pipe_v2.c
+++ b/drivers/platform/goldfish/goldfish_pipe_v2.c
@@ -1193,13 +1193,15 @@ static int goldfish_pipe_device_init(struct 
platform_device *pdev,
        return 0;
 }
 
-static void goldfish_pipe_device_deinit(struct platform_device *pdev,
-                                       struct goldfish_pipe_dev *dev)
+static int goldfish_pipe_device_deinit(struct platform_device *pdev,
+                                      struct goldfish_pipe_dev *dev)
 {
        misc_deregister(&dev->miscdev);
        tasklet_kill(&dev->irq_tasklet);
        kfree(dev->pipes);
        free_page((unsigned long)dev->buffers);
+
+       return 0;
 }
 
 static int goldfish_pipe_probe(struct platform_device *pdev)
@@ -1245,8 +1247,7 @@ static int goldfish_pipe_remove(struct platform_device 
*pdev)
 {
        struct goldfish_pipe_dev *dev = platform_get_drvdata(pdev);
 
-       goldfish_pipe_device_deinit(pdev, dev);
-       return 0;
+       return goldfish_pipe_device_deinit(pdev, dev);
 }
 
 static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
-- 
2.19.0.397.gdd90340f6a-goog

Reply via email to