diff options
| author | Johan Hovold | 2015-11-25 15:59:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-11-26 00:39:16 +0100 |
| commit | 35822c04a5c232a7899d43a74f0d2fca5077b196 (patch) | |
| tree | bbb859bd9de15148a2a4735fc11c67f8defe26be /drivers/staging/greybus/connection.c | |
| parent | greybus: kill the endo (diff) | |
| download | kernel-qcow2-linux-35822c04a5c232a7899d43a74f0d2fca5077b196.tar.gz kernel-qcow2-linux-35822c04a5c232a7899d43a74f0d2fca5077b196.tar.xz kernel-qcow2-linux-35822c04a5c232a7899d43a74f0d2fca5077b196.zip | |
greybus: connection: handle bundle-less connections in svc helpers
The svc connection helper functions should not assume that all dynamic
connections will have a bundle.
This is needed as the control bundle is going away.
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/connection.c')
| -rw-r--r-- | drivers/staging/greybus/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index 7beab7468a0d..7dde8a11935e 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -294,7 +294,7 @@ gb_connection_svc_connection_create(struct gb_connection *connection) if (gb_connection_is_static(connection)) return 0; - intf = connection->bundle->intf; + intf = connection->intf; ret = gb_svc_connection_create(hd->svc, hd->svc->ap_intf_id, connection->hd_cport_id, @@ -320,7 +320,7 @@ gb_connection_svc_connection_destroy(struct gb_connection *connection) gb_svc_connection_destroy(connection->hd->svc, connection->hd->svc->ap_intf_id, connection->hd_cport_id, - connection->bundle->intf->interface_id, + connection->intf->interface_id, connection->intf_cport_id); } |