diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 17:54:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 17:54:22 -0700 |
| commit | b240452a0f5846280e25be7c5a507a99b382fd10 (patch) | |
| tree | 68cbc17a2ad46b816048a08b75f0bb217307785e /drivers/video | |
| parent | f0c1bc95a108b36677dde6c9d96a5bb810a05b75 (diff) | |
| parent | b1f85c0fec20e6cde2a511345f24f6133f247e70 (diff) | |
| download | linux-b240452a0f5846280e25be7c5a507a99b382fd10.tar.bz2 | |
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
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/88pm860x_bl.c | 5 | ||||
| -rw-r--r-- | drivers/video/backlight/da9052_bl.c | 1 |
2 files changed, 2 insertions, 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; 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 = { |