Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
drivers/regulator/core.c
between commit:
85f3b4311629 ("regulator: core: Remove regulator_list")
from the regulator tree and commit:
5634acd9c8e3 ("regulator: core: Probe regulators on demand")
from the dt-rh tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell [email protected]
diff --cc drivers/regulator/core.c
index 7896ef53ff86,c2e5c2ae85c1..000000000000
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -1421,9 -1341,11 +1422,10 @@@ static struct regulator_dev *regulator_
if (dev && dev->of_node) {
node = of_get_regulator(dev, supply);
if (node) {
+ of_device_probe(node);
- list_for_each_entry(r, ®ulator_list, list)
- if (r->dev.parent &&
- node == r->dev.of_node)
- return r;
+ r = of_find_regulator_by_node(node);
+ if (r)
+ return r;
*ret = -EPROBE_DEFER;
return NULL;
} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
