diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 2b2be3fd1638..6078443a7dca 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -421,7 +421,19 @@ int gb_connection_init(struct gb_connection *connection)
 	 * this for SVC as that is initiated by the SVC.
 	 */
 	if (connection->hd_cport_id != GB_SVC_CPORT_ID) {
-		ret = gb_protocol_get_version(connection, false);
+		bool send_request = false;
+
+		/*
+		 * We need to send the protocol version of the firmware protocol
+		 * supported by AP and so this special case.
+		 */
+		if (connection->protocol->id == GREYBUS_PROTOCOL_FIRMWARE)
+			send_request = true;
+
+		// FIXME: Should we always send the protocol version AP can
+		// support ?
+
+		ret = gb_protocol_get_version(connection, send_request);
 		if (ret) {
 			dev_err(&connection->dev,
 				"Failed to get version CPort-%d (%d)\n",