summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2022-12-12 20:11:20 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2022-12-12 20:11:20 +0100
commit9917db36e42acac81ff914faf19af3d95e90e327 (patch)
tree4658ad2da6ec3f47aa41612773194d257e180c5d /drivers/regulator
parentca188ad0da3b95ee99eab57187f995492bf259eb (diff)
parent3ec12bd4de20561bef8ecb4989c900a061e925d0 (diff)
downloadbarebox-9917db36e42acac81ff914faf19af3d95e90e327.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 4876f0f44b..d25aba38c3 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -388,7 +388,7 @@ struct regulator *regulator_get(struct device_d *dev, const char *supply)
struct regulator *r;
int ret;
- if (dev->device_node) {
+ if (dev->device_node && supply) {
ri = of_regulator_get(dev, supply);
if (IS_ERR(ri))
return ERR_CAST(ri);