diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
| commit | c3a84a3f760b3892501591f5a6b037611477dc9f (patch) | |
| tree | ded61e87cdeb597fdf96edf72618ed9d518e74bd /arch/arm/mach-imx/imx-bbu-internal.c | |
| parent | a0643f615d3f54866443050334229c984b83c1b1 (diff) | |
| parent | ac6e464cb29e83c02c9e39a4b78a819d82b4f06b (diff) | |
| download | barebox-c3a84a3f760b3892501591f5a6b037611477dc9f.tar.gz barebox-c3a84a3f760b3892501591f5a6b037611477dc9f.tar.xz | |
Merge branch 'for-next/ext4'
Diffstat (limited to 'arch/arm/mach-imx/imx-bbu-internal.c')
| -rw-r--r-- | arch/arm/mach-imx/imx-bbu-internal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c index a36a4271ed..a78dde7526 100644 --- a/arch/arm/mach-imx/imx-bbu-internal.c +++ b/arch/arm/mach-imx/imx-bbu-internal.c @@ -110,7 +110,7 @@ static int imx_bbu_internal_v1_update(struct bbu_handler *handler, struct bbu_da int ret, image_len; void *buf; - if (file_detect_type(data->image) != filetype_arm_barebox) { + if (file_detect_type(data->image, data->len) != filetype_arm_barebox) { if (!bbu_force(data, "Not an ARM barebox image")) return -EINVAL; } @@ -332,7 +332,7 @@ static int imx_bbu_internal_v2_update(struct bbu_handler *handler, struct bbu_da int ret, image_len; void *buf; - if (file_detect_type(data->image) != filetype_arm_barebox) { + if (file_detect_type(data->image, data->len) != filetype_arm_barebox) { if (!bbu_force(data, "Not an ARM barebox image")) return -EINVAL; } |