summaryrefslogtreecommitdiff
path: root/drivers/video/backlight/88pm860x_bl.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:36 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-21 16:10:42 +1100
commit846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch)
treea19c658572beb8963dabe962f626265845b5d6b2 /drivers/video/backlight/88pm860x_bl.c
parent8cc156311126614ff6a59560e4eb20731156f799 (diff)
parentda691fd2697453e910a4bd0c8daaa80da48a0935 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/video/backlight/88pm860x_bl.c')
-rw-r--r--drivers/video/backlight/88pm860x_bl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index c072ed9aea36..2cd63507ed74 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -165,8 +165,10 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev,
struct pm860x_backlight_data *data,
char *name)
{
- struct device_node *nproot = pdev->dev.parent->of_node, *np;
+ 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");
@@ -184,6 +186,7 @@ static int pm860x_backlight_dt_init(struct platform_device *pdev,
break;
}
}
+ of_node_put(nproot);
return 0;
}
#else