diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index c57deb2053ac..b32da8af68f4 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -344,7 +344,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 && cport_id != GB_SVC_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);
@@ -396,7 +397,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 && cport_id != GB_SVC_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;