Skip to content

Commit

Permalink
utils/hooks: Don't fail early if fb0 missing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
sammj committed Mar 16, 2017
1 parent d0602ed commit 8107b37
Showing 1 changed file with 31 additions and 16 deletions.
47 changes: 31 additions & 16 deletions utils/hooks/30-dtb-updates.c
Expand Up @@ -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;
Expand All @@ -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;
}

0 comments on commit 8107b37

Please sign in to comment.