From e66040cbd21fd731e818ef9261a893cb1ae5c90f Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 6 Jun 2014 14:35:51 -0700 Subject: drivers/rtc/rtc-88pm860x.c: use of_get_child_by_name() Use of_get_child_by_name() to obtain reference to charger node instead of of_find_node_by_name() which can walk outside of the parent node. Signed-off-by: Krzysztof Kozlowski Acked-by: Jingoo Han Cc: Haojian Zhuang Cc: Sachin Kamat Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-88pm860x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/rtc/rtc-88pm860x.c') diff --git a/drivers/rtc/rtc-88pm860x.c b/drivers/rtc/rtc-88pm860x.c index 816504846cd..fb9e3c63b4a 100644 --- a/drivers/rtc/rtc-88pm860x.c +++ b/drivers/rtc/rtc-88pm860x.c @@ -293,7 +293,7 @@ static int pm860x_rtc_dt_init(struct platform_device *pdev, int ret; if (!np) return -ENODEV; - np = of_find_node_by_name(np, "rtc"); + np = of_get_child_by_name(np, "rtc"); if (!np) { dev_err(&pdev->dev, "failed to find rtc node\n"); return -ENODEV; -- cgit v1.2.3-70-g09d2 From 1e83d48b5e84e4c71a073e35ea4e2e6d0a1bdaac Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 6 Jun 2014 14:35:52 -0700 Subject: drivers/rtc/rtc-88pm860x.c: add missing of_node_put() Add missing of_node_put() to decrement the reference count. Signed-off-by: Krzysztof Kozlowski Acked-by: Jingoo Han Cc: Haojian Zhuang Cc: Sachin Kamat Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-88pm860x.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/rtc/rtc-88pm860x.c') diff --git a/drivers/rtc/rtc-88pm860x.c b/drivers/rtc/rtc-88pm860x.c index fb9e3c63b4a..0c6add1a38d 100644 --- a/drivers/rtc/rtc-88pm860x.c +++ b/drivers/rtc/rtc-88pm860x.c @@ -301,6 +301,7 @@ static int pm860x_rtc_dt_init(struct platform_device *pdev, ret = of_property_read_u32(np, "marvell,88pm860x-vrtc", &info->vrtc); if (ret) info->vrtc = 0; + of_node_put(np); return 0; } #else -- cgit v1.2.3-70-g09d2