Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[safe/jmp/linux-2.6] / include / linux / ihex.h

diff --git a/include/linux/ihex.h b/include/linux/ihex.h
index df89edd..31d8629 100644 (file)
--- a/include/linux/ihex.h
+++ b/include/linux/ihex.h
@@ -9,6 +9,7 @@
 
 #include <linux/types.h>
 #include <linux/firmware.h>
+#include <linux/device.h>
 
 /* Intel HEX files actually limit the length to 256 bytes, but we have
    drivers which would benefit from using separate records which are
@@ -17,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 *
@@ -47,4 +48,27 @@ static inline int ihex_validate_fw(const struct firmware *fw)
        }
        return -EINVAL;
 }
+
+/* Request firmware and validate it so that we can trust we won't
+ * run off the end while reading records... */
+static inline int request_ihex_firmware(const struct firmware **fw,
+                                       const char *fw_name,
+                                       struct device *dev)
+{
+       const struct firmware *lfw;
+       int ret;
+
+       ret = request_firmware(&lfw, fw_name, dev);
+       if (ret)
+               return ret;
+       ret = ihex_validate_fw(lfw);
+       if (ret) {
+               dev_err(dev, "Firmware \"%s\" not valid IHEX records\n",
+                       fw_name);
+               release_firmware(lfw);
+               return ret;
+       }
+       *fw = lfw;
+       return 0;
+}
 #endif /* __LINUX_IHEX_H__ */