From: Axel Lin Date: Thu, 29 Dec 2011 09:03:20 +0000 (+0800) Subject: regulator: Fix checking return value of create_regulator X-Git-Tag: v3.3-rc1~126^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32c78de8f17369def492ea3ddd785f0cc140af02;p=karo-tx-linux.git regulator: Fix checking return value of create_regulator create_regulator() returns NULL on fail. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6cb9d399affd..e70e15c4aa28 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -985,9 +985,8 @@ static int set_supply(struct regulator_dev *rdev, rdev_info(rdev, "supplied by %s\n", rdev_get_name(supply_rdev)); rdev->supply = create_regulator(supply_rdev, &rdev->dev, "SUPPLY"); - if (IS_ERR(rdev->supply)) { - err = PTR_ERR(rdev->supply); - rdev->supply = NULL; + if (rdev->supply == NULL) { + err = -ENOMEM; return err; }