From: Johan Hovold <johan@hovoldconsulting.com>
Date: Wed, 9 Mar 2016 11:20:38 +0000 (+0100)
Subject: greybus: svc: always register interfaces at hotplug
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=986d6911083150a15b723b33f9aaaf5744b84a84;p=linux-beck.git

greybus: svc: always register interfaces at hotplug

Always register interfaces at hotplug regardless of whether
initialisation succeeded or not.

Even if a module failed to initialise we want it to have a
representation while it is physically present.

Note that the vendor and product-string attribute will read as "(null)"
for now on an interface that failed (early) initialisation.

Also note that the switch route is kept until the interface is finally
removed also on initialisation errors.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Jeffrey Carlyle <jcarlyle@google.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 0a6c0393e20e..572ed0e23fe7 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -521,8 +521,12 @@ err_ida_remove:
 static void gb_svc_interface_route_destroy(struct gb_svc *svc,
 						struct gb_interface *intf)
 {
+	if (intf->device_id == GB_DEVICE_ID_BAD)
+		return;
+
 	gb_svc_route_destroy(svc, svc->ap_intf_id, intf->interface_id);
 	ida_simple_remove(&svc->device_id_map, intf->device_id);
+	intf->device_id = GB_DEVICE_ID_BAD;
 }
 
 static void gb_svc_intf_remove(struct gb_svc *svc, struct gb_interface *intf)
@@ -615,30 +619,22 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation)
 	if (ret) {
 		dev_err(&svc->dev, "failed to clear boot status of interface %u: %d\n",
 				intf_id, ret);
-		goto destroy_interface;
+		goto out_interface_add;
 	}
 
 	ret = gb_svc_interface_route_create(svc, intf);
 	if (ret)
-		goto destroy_interface;
+		goto out_interface_add;
 
 	ret = gb_interface_init(intf);
 	if (ret) {
 		dev_err(&svc->dev, "failed to initialize interface %u: %d\n",
 				intf_id, ret);
-		goto destroy_route;
+		goto out_interface_add;
 	}
 
-	ret = gb_interface_add(intf);
-	if (ret)
-		goto destroy_route;
-
-	return;
-
-destroy_route:
-	gb_svc_interface_route_destroy(svc, intf);
-destroy_interface:
-	gb_interface_remove(intf);
+out_interface_add:
+	gb_interface_add(intf);
 }
 
 static void gb_svc_process_intf_hot_unplug(struct gb_operation *operation)