diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2015-07-30 12:21:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-07-30 12:21:33 -0700 |
| commit | fff494340eab3c1d01f5df07041c4ce165bd13b8 (patch) | |
| tree | 8b9626eae7120fcbaac5d6d660d13c3ef90bb334 /drivers/staging/greybus/connection.c | |
| parent | e75b82bfc72533be25ce42241ca2d07b607ee705 (diff) | |
| parent | 48ed3f6e4202c9ddadac057108c273b8be85a78d (diff) | |
| download | linux-stable-fff494340eab3c1d01f5df07041c4ce165bd13b8.tar.gz linux-stable-fff494340eab3c1d01f5df07041c4ce165bd13b8.tar.bz2 linux-stable-fff494340eab3c1d01f5df07041c4ce165bd13b8.zip | |
greybus: Merge branch 'master' into svc to keep it up to date.
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, 2 insertions, 4 deletions
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index 1a657f706b93..e7f9c2f82982 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -349,8 +349,7 @@ 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 && - connection->hd_cport_id != GB_SVC_CPORT_ID) { + if (cport_id != GB_CONTROL_CPORT_ID) { struct gb_control *control = connection->bundle->intf->control; ret = gb_control_connected_operation(control, cport_id); @@ -402,8 +401,7 @@ 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 && - connection->hd_cport_id != GB_SVC_CPORT_ID) { + if (cport_id != GB_CONTROL_CPORT_ID) { struct gb_control *control = connection->bundle->intf->control; int ret; |