[PATCH] regulator: s2mps11: Fix NULL pointer of_node value when using platform data

[PATCH] regulator: s2mps11: Fix NULL pointer of_node value when using platform data

[Krzysztof Kozlowski]

When platform_data is used for regulator (of_node of sec-core MFD device
is NULL) the config.of_node for regulator is not initialized. This NULL
value of config.of_node is later stored during regulator_register().
Thus any call by regulator consumers to of_get_regulator() will fail on
of_parse_phandle() returning NULL.

In this case (using platform_data and parent's driver of_node is NULL)
set the config.of_node to reg_node from platform_data.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/regulator/s2mps11.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index d9e557990577..cd0b9e35a56d 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -441,6 +441,7 @@ common_reg:
 	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
 		if (!reg_np) {
 			config.init_data = pdata->regulators[i].initdata;
+			config.of_node = pdata->regulators[i].reg_node;
 		} else {
 			config.init_data = rdata[i].init_data;
 			config.of_node = rdata[i].of_node;
-- 
1.7.9.5

Re: [PATCH] regulator: s2mps11: Fix NULL pointer of_node value when using platform data

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

On Thu, Jan 30, 2014 at 02:51:19PM +0100, Krzysztof Kozlowski wrote:
> When platform_data is used for regulator (of_node of sec-core MFD device
> is NULL) the config.of_node for regulator is not initialized. This NULL
> value of config.of_node is later stored during regulator_register().
> Thus any call by regulator consumers to of_get_regulator() will fail on
> of_parse_phandle() returning NULL.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]