Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32574ff3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent fff49434

drivers/staging/greybus/connection.c

+4 −2
Original line number Diff line number Diff line
@@ -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;