iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: Merge branch 'master' into svc to keep it up to date.

Browse Source 
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2015-07-30 12:21:33 -07:00
commit fff494340e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/greybus/connection.c
View File

@ -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;