[U-Boot] [PATCH 1/3] mxs_ocotp: prevent error path from returning success

[Stefano Babic <sbabic@denx.de>]

On 21/11/2014 17:54, Hector Palacios wrote:
> 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>
> ---
>  drivers/misc/mxs_ocotp.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c
> index 545d3ebf520e..09002814f2f0 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;
>  }
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================