git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589' and...
[sfrench/cifs-2.6.git]
/
drivers
/
regulator
/
max8997.c
diff --git
a/drivers/regulator/max8997.c
b/drivers/regulator/max8997.c
index 90b4c530dee530b7255b21d238929d744de5abcd..9c31e215a521e71c7cf7148f8e69a09ce5f58acc 100644
(file)
--- a/
drivers/regulator/max8997.c
+++ b/
drivers/regulator/max8997.c
@@
-917,7
+917,7
@@
static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
struct max8997_regulator_data *rdata;
unsigned int i, dvs_voltage_nr = 1, ret;
- pmic_np =
of_node_get(iodev->dev->of_node)
;
+ pmic_np =
iodev->dev->of_node
;
if (!pmic_np) {
dev_err(&pdev->dev, "could not find pmic sub-node\n");
return -ENODEV;