diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2015-07-30 12:22:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-07-30 12:22:09 -0700 |
| commit | 32574ff3e4360e7c98fe5b2d54afb652aca45a8d (patch) | |
| tree | 21a45bd2cdec7a3e419cc516642f81d7deb7fbdd /drivers/staging/greybus/connection.c | |
| parent | fff494340eab3c1d01f5df07041c4ce165bd13b8 (diff) | |
| download | linux-stable-32574ff3e4360e7c98fe5b2d54afb652aca45a8d.tar.gz linux-stable-32574ff3e4360e7c98fe5b2d54afb652aca45a8d.tar.bz2 linux-stable-32574ff3e4360e7c98fe5b2d54afb652aca45a8d.zip | |
greybus: Revert "connection: remove special check for svc cport id"
This reverts commit 60b1d71fdfc2c5266051a1297df01ea0b1f3ba99 as we want
the port number to be correct in the svc branch.
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index e7f9c2f82982..1a657f706b93 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -349,7 +349,8 @@ int gb_connection_init(struct gb_connection *connection) * Inform Interface about Active CPorts. We don't need to do this * operation for control cport. */ - if (cport_id != GB_CONTROL_CPORT_ID) { + if (cport_id != GB_CONTROL_CPORT_ID && + connection->hd_cport_id != GB_SVC_CPORT_ID) { struct gb_control *control = connection->bundle->intf->control; ret = gb_control_connected_operation(control, cport_id); @@ -401,7 +402,8 @@ void gb_connection_exit(struct gb_connection *connection) * Inform Interface about In-active CPorts. We don't need to do this * operation for control cport. */ - if (cport_id != GB_CONTROL_CPORT_ID) { + if (cport_id != GB_CONTROL_CPORT_ID && + connection->hd_cport_id != GB_SVC_CPORT_ID) { struct gb_control *control = connection->bundle->intf->control; int ret; |