Re: [PATCH v2] regulator: ab8500: Don't update is_enabled flag inerror paths

[Bengt JÃnsson]

On 03/26/2013 09:13 AM, Axel Lin wrote:
> This avoid setting is_enabled flag to wrong status if enable/disable fails.
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
Looks good to me, thanks.

Acked-by: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx>
> ---
> v2: Just make the coding style consist with rest of the code.
>
>   drivers/regulator/ab8500.c |    8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
> index 12e2740..4a70323 100644
> --- a/drivers/regulator/ab8500.c
> +++ b/drivers/regulator/ab8500.c
> @@ -117,9 +117,11 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
>   	ret = abx500_mask_and_set_register_interruptible(info->dev,
>   		info->update_bank, info->update_reg,
>   		info->update_mask, info->update_val);
> -	if (ret < 0)
> +	if (ret < 0) {
>   		dev_err(rdev_get_dev(rdev),
>   			"couldn't set enable bits for regulator\n");
> +		return ret;
> +	}
>   
>   	info->is_enabled = true;
>   
> @@ -144,9 +146,11 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
>   	ret = abx500_mask_and_set_register_interruptible(info->dev,
>   		info->update_bank, info->update_reg,
>   		info->update_mask, 0x0);
> -	if (ret < 0)
> +	if (ret < 0) {
>   		dev_err(rdev_get_dev(rdev),
>   			"couldn't set disable bits for regulator\n");
> +		return ret;
> +	}
>   
>   	info->is_enabled = false;
>   

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/