[1/2] utils/hooks: Don't fail early if fb0 missing
diff mbox

Message ID 20170316041952.26883-1-sam@mendozajonas.com
State Accepted
Headers show

Commit Message

Samuel Mendoza-Jonas March 16, 2017, 4:19 a.m. UTC
30-dtb-updates would exit early if the 'fb0' file was missing, however
the set_stdout() step does not depend on this.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---
 utils/hooks/30-dtb-updates.c | 47 +++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 16 deletions(-)

Patch
diff mbox

diff --git a/utils/hooks/30-dtb-updates.c b/utils/hooks/30-dtb-updates.c
index aff3844..66e7a77 100644
--- a/utils/hooks/30-dtb-updates.c
+++ b/utils/hooks/30-dtb-updates.c
@@ -576,20 +576,10 @@  static int write_devicetree(struct offb_ctx *ctx)
 	return rc;
 }
 
-
-int main(void)
+static int set_offb(struct offb_ctx *ctx)
 {
-	struct offb_ctx *ctx;
 	int rc;
 
-	ctx = talloc_zero(NULL, struct offb_ctx);
-
-	ctx->dtb_name = getenv("boot_dtb");
-	if (!ctx->dtb_name) {
-		talloc_free(ctx);
-		return EXIT_SUCCESS;
-	}
-
 	rc = load_dtb(ctx);
 	if (rc)
 		goto out;
@@ -605,14 +595,39 @@  int main(void)
 	rc = populate_devicetree(ctx);
 	if (rc)
 		goto out;
+out:
+	return rc;
+}
 
-	rc = set_stdout(ctx);
-	if (rc)
-		goto out;
 
-	rc = write_devicetree(ctx);
+int main(void)
+{
+	struct offb_ctx *ctx;
+	int rc;
+
+	ctx = talloc_zero(NULL, struct offb_ctx);
+
+	ctx->dtb_name = getenv("boot_dtb");
+	if (!ctx->dtb_name) {
+		talloc_free(ctx);
+		return EXIT_SUCCESS;
+	}
+
+	if (set_offb(ctx)) {
+		warn("Failed offb setup step");
+		rc = -1;
+	}
+
+	if (set_stdout(ctx)) {
+		warn("Failed stdout setup step\n");
+		rc = -1;
+	}
+
+	if (write_devicetree(ctx)) {
+		warn("Failed to write back device tree\n");
+		rc = -1;
+	}
 
-out:
 	talloc_free(ctx);
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }