2015-08-17 16:19:00

by Bjorn Andersson

Subject: [PATCH] leds: syscon: Correct check for syscon_node_to_regmap() errors

syscon_node_to_regmap() returns a regmap or an ERR_PTR().

Signed-off-by: Bjorn Andersson <[email protected]>
---
drivers/leds/leds-syscon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c
index d1660b039812..39fca4c9f1ee 100644
--- a/drivers/leds/leds-syscon.c
+++ b/drivers/leds/leds-syscon.c
@@ -83,7 +83,7 @@ static int syscon_led_probe(struct platform_device *pdev)
return -ENODEV;
}
map = syscon_node_to_regmap(parent->of_node);
- if (!map) {
+ if (IS_ERR(map)) {
dev_err(dev, "no regmap for syscon LED parent\n");
return -ENODEV;
}
--
1.8.2.2

2015-08-18 10:35:45

by Jacek Anaszewski

Subject: Re: [PATCH] leds: syscon: Correct check for syscon_node_to_regmap() errors

Hi Bjor,

On 08/17/2015 06:18 PM, Bjorn Andersson wrote:
> syscon_node_to_regmap() returns a regmap or an ERR_PTR().
>
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> drivers/leds/leds-syscon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c
> index d1660b039812..39fca4c9f1ee 100644
> --- a/drivers/leds/leds-syscon.c
> +++ b/drivers/leds/leds-syscon.c
> @@ -83,7 +83,7 @@ static int syscon_led_probe(struct platform_device *pdev)
> return -ENODEV;
> }
> map = syscon_node_to_regmap(parent->of_node);
> - if (!map) {
> + if (IS_ERR(map)) {
> dev_err(dev, "no regmap for syscon LED parent\n");
> return -ENODEV;

return PTR_ERR(map) ?

> }
>


--
Best Regards,
Jacek Anaszewski

2015-08-18 19:25:44

by Bjorn Andersson

Subject: [PATCH v2] leds: syscon: Correct check for syscon_node_to_regmap() errors

syscon_node_to_regmap() returns a regmap or an ERR_PTR().

Signed-off-by: Bjorn Andersson <[email protected]>
---

Changes since v1:
- Propagate the error

drivers/leds/leds-syscon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c
index d1660b039812..b88900d721e4 100644
--- a/drivers/leds/leds-syscon.c
+++ b/drivers/leds/leds-syscon.c
@@ -83,9 +83,9 @@ static int syscon_led_probe(struct platform_device *pdev)
return -ENODEV;
}
map = syscon_node_to_regmap(parent->of_node);
- if (!map) {
+ if (IS_ERR(map)) {
dev_err(dev, "no regmap for syscon LED parent\n");
- return -ENODEV;
+ return PTR_ERR(map);
}

sled = devm_kzalloc(dev, sizeof(*sled), GFP_KERNEL);
--
1.8.2.2

2015-08-24 08:20:31

by Jacek Anaszewski

Subject: Re: [PATCH v2] leds: syscon: Correct check for syscon_node_to_regmap() errors

On 08/18/2015 09:25 PM, Bjorn Andersson wrote:
> syscon_node_to_regmap() returns a regmap or an ERR_PTR().
>
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
>
> Changes since v1:
> - Propagate the error
>
> drivers/leds/leds-syscon.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/leds-syscon.c b/drivers/leds/leds-syscon.c
> index d1660b039812..b88900d721e4 100644
> --- a/drivers/leds/leds-syscon.c
> +++ b/drivers/leds/leds-syscon.c
> @@ -83,9 +83,9 @@ static int syscon_led_probe(struct platform_device *pdev)
> return -ENODEV;
> }
> map = syscon_node_to_regmap(parent->of_node);
> - if (!map) {
> + if (IS_ERR(map)) {
> dev_err(dev, "no regmap for syscon LED parent\n");
> - return -ENODEV;
> + return PTR_ERR(map);
> }
>
> sled = devm_kzalloc(dev, sizeof(*sled), GFP_KERNEL);
>

Merged, thanks.

--
Best Regards,
Jacek Anaszewski