diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index b79d81717360..5a16ad33b74b 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -518,7 +518,12 @@ static void gb_svc_process_intf_hotplug(struct gb_operation *operation)
 		goto err_interface_deactivate;
 	}
 
-	gb_interface_add(intf);
+	ret = gb_interface_add(intf);
+	if (ret) {
+		gb_interface_disable(intf);
+		gb_interface_deactivate(intf);
+		return;
+	}
 
 	return;