Re: [PATCH v2] mfd: arizona: Add missing braces

From: Lee Jones
Date: Tue May 26 2015 - 09:56:28 EST


On Tue, 19 May 2015, Charles Keepax wrote:

> Some braces were missing from commit 67f0b1133d55 ("mfd: arizona:
> Add better support for system suspend"). This will cause the error check
> to run even if the register write didn't happen (although ret will
> always be zero so it is harmless). This patch adds the missing
> braces.
>
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>
> Changes since v1:
> - Corrected braino in commit message (parenthesis -> braces)
>
> Thanks,
> Charles
>
> drivers/mfd/arizona-core.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)

Fixed-up into the original patch.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 5caf579..bebf58a 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -626,7 +626,7 @@ static int arizona_runtime_suspend(struct device *dev)
> }
> break;
> case WM5102:
> - if (!(val & ARIZONA_JD1_ENA))
> + if (!(val & ARIZONA_JD1_ENA)) {
> ret = regmap_write(arizona->regmap,
> ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
> if (ret) {
> @@ -635,6 +635,7 @@ static int arizona_runtime_suspend(struct device *dev)
> ret);
> return ret;
> }
> + }
> break;
> default:
> break;

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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/