2 files changed, 4 insertions, 4 deletions

diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
index 660b191ed75e..8f7fdaa9e010 100644
--- a/firmware/ihex2fw.c
+++ b/firmware/ihex2fw.c
@@ -250,19 +250,19 @@ static void file_record(struct ihex_binrec *record)
 
 static int output_records(int outfd)
 {
-        unsigned char zeroes[5] = {0, 0, 0, 0, 0};
+        unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
         struct ihex_binrec *p = records;
 
         while (p) {
                 uint16_t writelen = (p->len + 9) & ~3;
 
                 p->addr = htonl(p->addr);
-                p->len = htonl(p->len);
+                p->len = htons(p->len);
                 write(outfd, &p->addr, writelen);
                 p = p->next;
         }
         /* EOF record is zero length, since we don't bother to represent
            the type field in the binary version */
-        write(outfd, zeroes, 5);
+        write(outfd, zeroes, 6);
         return 0;
 }
diff --git a/include/linux/ihex.h b/include/linux/ihex.h
index 2baace2788a7..31d8629e75a1 100644
--- a/include/linux/ihex.h
+++ b/include/linux/ihex.h
@@ -18,7 +18,7 @@ struct ihex_binrec {
         __be32 addr;
         __be16 len;
         uint8_t data[0];
-} __attribute__((aligned(4)));
+} __attribute__((packed));
 
 /* Find the next record, taking into account the 4-byte alignment */
 static inline const struct ihex_binrec *