Commit b240452a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'backlight-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight updates from Lee Jones:
 "Changes to existing drivers:

   - Use of_get_child_by_name() instead of refcount; 88pm860x_bl

   - Terminate array with NULL element; da9052_bl"

* tag 'backlight-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: da9052_bl: Terminate da9052_wled_ids array with empty element
  backlight: 88pm860x_bl: Use of_get_child_by_name() instead of refcount hack
parents f0c1bc95 b1f85c0f
...@@ -168,10 +168,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev, ...@@ -168,10 +168,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev,
struct device_node *nproot, *np; struct device_node *nproot, *np;
int iset = 0; int iset = 0;
nproot = of_node_get(pdev->dev.parent->of_node); nproot = of_get_child_by_name(pdev->dev.parent->of_node, "backlights");
if (!nproot)
return -ENODEV;
nproot = of_find_node_by_name(nproot, "backlights");
if (!nproot) { if (!nproot) {
dev_err(&pdev->dev, "failed to find backlights node\n"); dev_err(&pdev->dev, "failed to find backlights node\n");
return -ENODEV; return -ENODEV;
......
...@@ -165,6 +165,7 @@ static struct platform_device_id da9052_wled_ids[] = { ...@@ -165,6 +165,7 @@ static struct platform_device_id da9052_wled_ids[] = {
.name = "da9052-wled3", .name = "da9052-wled3",
.driver_data = DA9052_TYPE_WLED3, .driver_data = DA9052_TYPE_WLED3,
}, },
{ },
}; };
static struct platform_driver da9052_wled_driver = { static struct platform_driver da9052_wled_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment