[PATCH 05/32] staging: gasket: remove driver registration on class creation failure

[Todd Poynor]

From: Todd Poynor <toddpoy...@google.com>

If class_create() fails, remove the gasket driver from the global
registration table.

Signed-off-by: Zhongze Hu <fran...@chromium.org>
Signed-off-by: Todd Poynor <toddpoy...@google.com>
---
 drivers/staging/gasket/gasket_core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/gasket/gasket_core.c 
b/drivers/staging/gasket/gasket_core.c
index b69b630f1b79b..cbadab7544c81 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -335,7 +335,8 @@ int gasket_register_device(const struct gasket_driver_desc 
*driver_desc)
        if (IS_ERR_OR_NULL(internal->class)) {
                gasket_nodev_error("Cannot register %s class [ret=%ld]",
                                   driver_desc->name, PTR_ERR(internal->class));
-               return PTR_ERR(internal->class);
+               ret = PTR_ERR(internal->class);
+               goto unregister_gasket_driver;
        }
 
        /*
@@ -369,6 +370,7 @@ int gasket_register_device(const struct gasket_driver_desc 
*driver_desc)
 fail1:
        class_destroy(internal->class);
 
+unregister_gasket_driver:
        g_descs[desc_idx].driver_desc = NULL;
        return ret;
 }
-- 
2.18.0.203.gfac676dfb9-goog