From 6c8030caae623faa56077b41b91f06cca6b2f344 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 31 May 2008 15:20:37 +0300
Subject: [PATCH] --- yaml --- r: 100979 b: refs/heads/master c:
 f1485f3deb89e6ae10c4d34662ec9e692855ab5d h: refs/heads/master i:   100977:
 b0e7fe2882f1fe82ef003ce5dcdd8eb1c3ed39d7   100975:
 d3f38a3b701f3ad5359ee3d2b2e9aaa7c4857762 v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/ihex.h | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfb0be7b5d77..f8485eb1e94b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bacfe09dd7545467965e8d8f1eab20bc62dce00d
+refs/heads/master: f1485f3deb89e6ae10c4d34662ec9e692855ab5d
diff --git a/trunk/include/linux/ihex.h b/trunk/include/linux/ihex.h
index df89edd890ae..2baace2788a7 100644
--- a/trunk/include/linux/ihex.h
+++ b/trunk/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
@@ -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__ */