diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-05-31 16:20:37 +0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-10 17:47:38 +0400 |
| commit | f1485f3deb89e6ae10c4d34662ec9e692855ab5d (patch) | |
| tree | 8d7d03cabfbd38e904d76c96aa1b5a1e830dac22 | |
| parent | bacfe09dd7545467965e8d8f1eab20bc62dce00d (diff) | |
| download | linux-f1485f3deb89e6ae10c4d34662ec9e692855ab5d.tar.xz | |
ihex: request_ihex_firmware() function to load and validate firmware
Provide a helper to load the file and validate it in one call, to
simplify error handling in the drivers which are going to use it.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | include/linux/ihex.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/include/linux/ihex.h b/include/linux/ihex.h index df89edd890ae..2baace2788a7 100644 --- 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 @@ -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__ */ |