projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
regulator
/
ti-abb-regulator.c
diff --git
a/drivers/regulator/ti-abb-regulator.c
b/drivers/regulator/ti-abb-regulator.c
index 340faf329fbb2f9eaa165e5c5429fa041904ea56..d2f9942987535586dc69da863fbaa6b4ab16bdf4 100644
(file)
--- a/
drivers/regulator/ti-abb-regulator.c
+++ b/
drivers/regulator/ti-abb-regulator.c
@@
-837,7
+837,8
@@
skip_opt:
return -EINVAL;
}
- initdata = of_get_regulator_init_data(dev, pdev->dev.of_node);
+ initdata = of_get_regulator_init_data(dev, pdev->dev.of_node,
+ &abb->rdesc);
if (!initdata) {
dev_err(dev, "%s: Unable to alloc regulator init data\n",
__func__);