mfd: arizona: Correct handling of device tree gpio defaults
Subsystems (2)
PATCH 1/1 mfd: arizona: Correct handling of device tree gpio defaults
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 <[email protected]>
Signed-off-by Charles Keepax <[email protected]>
--- drivers/mfd/arizona-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/arizona-core.c +1 -1
@@ -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 {
Signature · 1 line
1.7.2.5
Quoted 4 lines · Charles Keepax
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.
Code looks good. I'm not sure I understand the commit message within the current context.
Quoted 19 lines
Reported-by Heather Lomond <[email protected]>Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/arizona-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mfd/arizona-core.c +1
-1@@ -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 {
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog