greybus: endo: fix device-id allocation

During endo registration, a unique device id was allocated but then
never used. Instead the default dev_id 0 (due to kzalloc) was used for
device-generation and later for id-deallocation.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/endo.c b/drivers/staging/greybus/endo.c
index c0dc43ff6a5c35524351f3438f7b40acea01c1dc..37d2dec17a30ef51f4d54312dbdb254291addd93 100644 (file)
--- a/drivers/staging/greybus/endo.c
+++ b/drivers/staging/greybus/endo.c
@@ -438,11 +438,14 @@ static int create_modules(struct gb_endo *endo)
 static int gb_endo_register(struct greybus_host_device *hd,
                            struct gb_endo *endo)
 {
+       int dev_id;
        int retval;
 
-       retval = ida_simple_get(&greybus_endo_id_map, 0, 0, GFP_KERNEL);
-       if (retval < 0)
-               return retval;
+       dev_id = ida_simple_get(&greybus_endo_id_map, 0, 0, GFP_KERNEL);
+       if (dev_id < 0)
+               return dev_id;
+
+       endo->dev_id = dev_id;
 
        endo->dev.parent = hd->parent;
        endo->dev.bus = &greybus_bus_type;