greybus: connection: Call connection_destroy() from gb_connection_svc_connection_dest...

connection_create() is called right after svc is requested to create the
connection and so connection_destroy() must be called just before we
request the SVC to destroy the connection.

Over that, this fixes the inconsistency where connection_create() is
called for all connections except SVC connection, but
connection_destroy() is called always.

Acked-by: Alexandre Bailon <abailon@baylibre.com>
Fixes: 5313ca607afb ("Greybus driver: add a new callbacks to driver")
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index de3962ab07bceb8cd88e35a390527f49aee5285a..e1a7705fd227d893f1c7a76863e19ed8d02c4a0b 100644 (file)
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -318,6 +318,9 @@ gb_connection_svc_connection_destroy(struct gb_connection *connection)
        if (connection->hd_cport_id == GB_SVC_CPORT_ID)
                return;
 
+       if (connection->hd->driver->connection_destroy)
+               connection->hd->driver->connection_destroy(connection);
+
        gb_svc_connection_destroy(connection->hd->svc,
                                  connection->hd->endo->ap_intf_id,
                                  connection->hd_cport_id,
@@ -462,9 +465,6 @@ void gb_connection_destroy(struct gb_connection *connection)
        list_del(&connection->hd_links);
        spin_unlock_irq(&gb_connections_lock);
 
-       if (connection->hd->driver->connection_destroy)
-               connection->hd->driver->connection_destroy(connection);
-
        if (connection->protocol)
                gb_protocol_put(connection->protocol);
        connection->protocol = NULL;