From e83aab57f749454eb4d868f806b8f5262a37297b Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Wed, 10 Jun 2020 07:31:59 +0200
Subject: [PATCH] infra: fix brick power override

---
 kernel/sy_old/sy_generic.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/sy_old/sy_generic.c b/kernel/sy_old/sy_generic.c
index f94fdb39..b78360f0 100644
--- a/kernel/sy_old/sy_generic.c
+++ b/kernel/sy_old/sy_generic.c
@@ -2941,9 +2941,10 @@ struct mars_brick *make_brick_all(
 		// just switch the power state
 		MARS_DBG("found existing brick '%s'\n", new_path);
 		// highest general override
-		if (mars_check_outputs(brick)) {
-			if (!switch_state)
-				MARS_DBG("brick '%s' override 0 -> 1\n", new_path);
+		if (!switch_state &&
+		    brick->power.button &&
+		    mars_check_outputs(brick)) {
+			MARS_DBG("KEEP '%s' override 0 -> 1\n", new_path);
 			switch_state = true;
 		}
 		goto do_switch;