From: Charles Keepax Date: Thu, 3 Oct 2013 15:16:01 +0000 (+0100) Subject: mfd: arizona: Correct handling of device tree gpio defaults X-Git-Tag: v3.13-rc1~66^2~4^2~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91c739359ac9946a8e74a9640527a3f1034a76a7;p=profile%2Fivi%2Fkernel-x86-ivi.git mfd: arizona: Correct handling of device tree gpio defaults When setting GPIO defaults we are required to make a distinction between writing 0x0000 to the registers and leaving them untouched. When we receive between 0x0000 and 0xFFFF (inclusive) from either Platform Data or Device Tree, we should write the provided configuration to the device. Conversely, when we receive >0xFFFF we should leave the device configuration at its default setting. This patch fixes a bug and ensures that configuration 0x0000 isn't mistakenly written when the intention was to keep the default one. Reported-by: Heather Lomond Signed-off-by: Charles Keepax Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index a2f5beff99d..ba808b74423 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 {