diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 69ea3a788771..3fee64773976 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -186,6 +186,8 @@ struct gb_connection *gb_connection_create(struct gb_interface *interface,
 
 	retval = device_add(&connection->dev);
 	if (retval) {
+		gb_connection_hd_cport_id_free(connection);
+		/* kref_put(connection->hd); */
 		kfree(connection);
 		return NULL;
 	}