sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Hector Palacios 2014-11-21 17:54:42 +01:00 committed by Stefano Babic
parent ec62c07aab
commit d8d160e420
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/misc/mxs_ocotp.c
View File

@ -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;
}