RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: immediately kill fresh bricks not creatable

This commit is contained in:
Thomas Schoebel-Theuer 2020-09-12 05:50:16 +02:00 committed by Thomas Schoebel-Theuer
parent 674564db72
commit 4d2d63eda0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/sy_old/sy_generic.c
View File

@ -3171,6 +3171,7 @@ struct mars_brick *make_brick_all(
const char *new_path;
char *_new_path = NULL;
struct mars_brick *brick = NULL;
struct mars_brick *old_brick;
char *paths[MAX_PREV_COUNT];
struct mars_brick *prev[MAX_PREV_COUNT];
bool switch_state;
@ -3195,13 +3196,9 @@ struct mars_brick *make_brick_all(
}
va_end(args);
if (!new_path) {
MARS_ERR("could not create new path\n");
goto err;
}
// get old switch state
brick = mars_find_brick(global, NULL, new_path);
old_brick = brick;
switch_state = false;
if (brick) {
switch_state = brick->power.button;
@ -3336,13 +3333,17 @@ do_switch:
status = mars_power_button((void *)brick, switch_state, false);
}
MARS_DBG("switch '%s' to %d status = %d\n", new_path, switch_state, status);
goto done;
/* only kill a fresh brick being powered off */
if (!old_brick || switch_state || status >= 0)
goto done;
err:
if (brick) {
mars_kill_brick(brick);
}
brick = NULL;
done:
for (i = 0; i < prev_count; i++) {
brick_string_free(paths[i]);