Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb

Conflicts:
	frsh_api/frsh_power.c

diff --git a/fres/cbroker/fcb.c b/fres/cbroker/fcb.c
index ead63e483a4ccbb74cbeb56c7f3a3a4ae872c001..d18d072d4224708070462608450fcd8352d22519 100644 (file)
--- a/fres/cbroker/fcb.c
+++ b/fres/cbroker/fcb.c
@@ -920,6 +920,10 @@ void peer_discovery_callback(const forb_orb peer_orb, const char *orb_id)
 #if 0
        ul_logmsg("peer discovered: %s (orb_id '%s')\n", server_id_str, orb_id);
 #endif
+
+       if (orb_id == NULL)
+               return;
+
        if (strcmp(orb_id, "org.frescor.fcb") == 0) {
                fosa_abs_time_t now;
                fosa_rel_time_t delay;

diff --git a/frsh_api/frsh_power.c b/frsh_api/frsh_power.c
index 36d6a857121d4ead7bf91b23e4405758dc01fe7c..bd81878f0728c0b1ded1711f0b8b830d75e3b196 100644 (file)
--- a/frsh_api/frsh_power.c
+++ b/frsh_api/frsh_power.c
@@ -375,7 +375,6 @@ int frsh_resource_get_num_power_levels
                {
                        ret = fra_CPU_power_init(resource_id);
                        if (ret) goto out;
-
                        break;
                }
 #endif