Messages in this thread Patch in this message | | | From | Charles Keepax <> | Subject | [PATCH] mfd: arizona: Correct handling of device tree gpio defaults | Date | Thu, 3 Oct 2013 11:42:16 +0100 |
| |
The intention is that all out of range values should cause the chips default settings to be used and a value of zero should be treated literally. Currently all out of range values will hit the second if and be treated as a literal zero. This patch adds an else to fix this issue.
Reported-by: Heather Lomond <heather.lomond@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- drivers/mfd/arizona-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 5ac3aa4..e13355b 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -540,7 +540,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) { if (arizona->pdata.gpio_defaults[i] > 0xffff) arizona->pdata.gpio_defaults[i] = 0; - if (arizona->pdata.gpio_defaults[i] == 0) + else if (arizona->pdata.gpio_defaults[i] == 0) arizona->pdata.gpio_defaults[i] = 0x10000; } } else { -- 1.7.2.5
| |