diff --git a/drivers/staging/greybus/ap.c b/drivers/staging/greybus/ap.c
index 10f3b4d2443d..ea197ac57b52 100644
--- a/drivers/staging/greybus/ap.c
+++ b/drivers/staging/greybus/ap.c
@@ -149,11 +149,13 @@ static void svc_management(struct svc_function_unipro_management *management,
 		ret = gb_bundle_init(intf,
 				management->link_up.interface_id,
 				management->link_up.device_id);
-		if (ret)
+		if (ret) {
 			dev_err(hd->parent,
 				"error %d initializing interface %hhu bundle %hhu\n",
 				ret, management->link_up.module_id,
 				management->link_up.interface_id);
+			return;
+		}
 		break;
 	default:
 		dev_err(hd->parent, "Unhandled UniPro management message\n");