From 0ecf230318d734964af3574d92636b5914fb3586 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 26 Aug 2009 12:54:04 +0200 Subject: [PATCH] --- yaml --- r: 165398 b: refs/heads/master c: a7433cff9ed8e7982de8e0f210f0325d0f3d1949 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba57b6ab111f..5bbafb360065 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e108d33edcb88bac3db39ba1683fc2c0591d7d4 +refs/heads/master: a7433cff9ed8e7982de8e0f210f0325d0f3d1949 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index dbf27bf028c4..744ea1d0b59b 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -1236,11 +1236,12 @@ static int _regulator_enable(struct regulator_dev *rdev) } else { return -EINVAL; } - } else { + } else if (ret < 0) { printk(KERN_ERR "%s: is_enabled() failed for %s: %d\n", __func__, rdev->desc->name, ret); return ret; } + /* Fallthrough on positive return values - already enabled */ } rdev->use_count++;