From 2d50b71352b263eccae9d117f9ac46550158a1db Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 5 Nov 2010 15:27:17 +0800 Subject: [PATCH] --- yaml --- r: 222782 b: refs/heads/master c: 7727da22e820a96ab394db2fc0ab58f7f7ecb323 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7ca3c55a991b..36c1b46ee5b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36c1df8e18183ba2c691fe766a52c94020cdc5e +refs/heads/master: 7727da22e820a96ab394db2fc0ab58f7f7ecb323 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 9da85bc21db4..711fa1722bce 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -2348,6 +2348,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, if (init_data->supply_regulator && init_data->supply_regulator_dev) { dev_err(dev, "Supply regulator specified by both name and dev\n"); + ret = -EINVAL; goto scrub; } @@ -2366,6 +2367,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, if (!found) { dev_err(dev, "Failed to find supply %s\n", init_data->supply_regulator); + ret = -ENODEV; goto scrub; }