From c6f77bc2b3f9512fd8d637a45060408061a035a9 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 14 Jan 2015 14:51:59 +0100 Subject: [PATCH 1/2] backlight: 88pm860x_bl: Use of_get_child_by_name() instead of refcount hack of_find_node_by_name() calls of_node_put() on its "from" parameter. To counter this, pm860x_backlight_dt_init() calls of_node_get() first. Use of_get_child_by_name() instead to get rid of the refcount hack. Signed-off-by: Geert Uytterhoeven Signed-off-by: Lee Jones --- drivers/video/backlight/88pm860x_bl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index 9a23698b6fe8..2da5862876d1 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c @@ -168,10 +168,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev, struct device_node *nproot, *np; int iset = 0; - nproot = of_node_get(pdev->dev.parent->of_node); - if (!nproot) - return -ENODEV; - nproot = of_find_node_by_name(nproot, "backlights"); + nproot = of_get_child_by_name(pdev->dev.parent->of_node, "backlights"); if (!nproot) { dev_err(&pdev->dev, "failed to find backlights node\n"); return -ENODEV; From b1f85c0fec20e6cde2a511345f24f6133f247e70 Mon Sep 17 00:00:00 2001 From: Andrey Ryabinin Date: Wed, 21 Jan 2015 18:06:08 +0300 Subject: [PATCH 2/2] backlight: da9052_bl: Terminate da9052_wled_ids array with empty element Array of platform_device_id elements should be terminated with empty element. Signed-off-by: Andrey Ryabinin Signed-off-by: Lee Jones --- drivers/video/backlight/da9052_bl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c index d4bd74bd5070..b1943e7735a1 100644 --- a/drivers/video/backlight/da9052_bl.c +++ b/drivers/video/backlight/da9052_bl.c @@ -165,6 +165,7 @@ static struct platform_device_id da9052_wled_ids[] = { .name = "da9052-wled3", .driver_data = DA9052_TYPE_WLED3, }, + { }, }; static struct platform_driver da9052_wled_driver = {