b43-asm: Pass external conditions as immediates

[b43-tools.git] / assembler / main.c

diff --git a/assembler/main.c b/assembler/main.c
index 34a057dc2ac61bcd780dc03a0b8e14ba251c92ae..a2ace1df993217396e295579569780521cb52a3c 100644 (file)
--- a/assembler/main.c
+++ b/assembler/main.c
@@ -469,7 +469,7 @@ static unsigned int merge_external_jmp_into_opcode(struct assembler_context *ctx
 
        ol = insn->operands;
        opcode = opbase;
-       cond = ol->oper[0]->u.raw;
+       cond = ol->oper[0]->u.imm->imm;
        if (cond & ~0xFF)
                asm_error(ctx, "External jump condition value too big (> 0xFF)");
        opcode |= cond;
@@ -1106,8 +1106,12 @@ int main(int argc, char **argv)
        int err, res = 1;
 
        err = parse_args(argc, argv);
-       if (err)
+       if (err < 0)
+               goto out;
+       if (err > 0) {
+               res = 0;
                goto out;
+       }
        err = open_input_file();
        if (err)
                goto out;