From d46d4a1e55afc115953d6ee502683943f9cb8e29 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 11 Mar 2012 13:07:56 +0000 Subject: [PATCH] --- yaml --- r: 288893 b: refs/heads/master c: 04bf30115f4ba2beda1efb6cfbae49cdc757f3a9 h: refs/heads/master i: 288891: 7b114135c8e7265883bd51f5790d292694b768d6 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ad90f255b6d5..98655f06e7a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 263a5c8e16c34199ddf6de3f102e789ffa3ee26e +refs/heads/master: 04bf30115f4ba2beda1efb6cfbae49cdc757f3a9 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index e9a83f84adaf..fcde037b3461 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -1210,7 +1210,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, { struct regulator_dev *rdev; struct regulator_map *map; - struct regulator *regulator = ERR_PTR(-ENODEV); + struct regulator *regulator = ERR_PTR(-EPROBE_DEFER); const char *devname = NULL; int ret; @@ -2834,7 +2834,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, if (!r) { dev_err(dev, "Failed to find supply %s\n", supply); - ret = -ENODEV; + ret = -EPROBE_DEFER; goto scrub; }