summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHector Palacios <hector.palacios@digi.com>2014-11-21 17:54:42 +0100
committerStefano Babic <sbabic@denx.de>2014-12-01 10:19:41 +0100
commitd8d160e4205aa2885cfe659102c9555ef0859fae (patch)
tree8a8830321f9aaa1112bd797650143b07953f057b /drivers
parentec62c07aab88bf6d620cacf070e857ce5d8b91f4 (diff)
downloadu-boot-imx-d8d160e4205aa2885cfe659102c9555ef0859fae.zip
u-boot-imx-d8d160e4205aa2885cfe659102c9555ef0859fae.tar.gz
u-boot-imx-d8d160e4205aa2885cfe659102c9555ef0859fae.tar.bz2
mxs_ocotp: prevent error path from returning success
The code may goto 'fail' upon error with 'ret' variable set to an error code, but this variable was being overwritten by a final preparation function to restore the HCLK, so success was (in general) returned even after an error was hit previously. With this change, the function may now return success even if the final preparation function fails, but it's probably enough to print a message because (if successful) the real programming of the fuses has already completed. Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/mxs_ocotp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
index 545d3eb..0900281 100644
--- a/drivers/misc/mxs_ocotp.c
+++ b/drivers/misc/mxs_ocotp.c
@@ -223,11 +223,8 @@ static int mxs_ocotp_write_fuse(uint32_t addr, uint32_t mask)
fail:
mxs_ocotp_scale_vddio(0, &vddio_val);
- ret = mxs_ocotp_scale_hclk(0, &hclk_val);
- if (ret) {
+ if (mxs_ocotp_scale_hclk(0, &hclk_val))
puts("Failed scaling up the HCLK!\n");
- return ret;
- }
return ret;
}