From d55b55966b38e414ea50de4532b33b1b0cd8ed75 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 17 Apr 2012 23:48:27 +0800 Subject: [PATCH] --- yaml --- r: 302245 b: refs/heads/master c: c245c087c50eabe284b22f7d5a8abc12427d29a7 h: refs/heads/master i: 302243: ba4f5f69556caae7ad17ff4f4e7244e329242146 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8997.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd8c8cc5d76b..f617b1dd5d85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94e85a3c5d702a4ce96b7a9b883c949a08ebd93c +refs/heads/master: c245c087c50eabe284b22f7d5a8abc12427d29a7 diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c index ec99bd30e603..d106b74fc821 100644 --- a/trunk/drivers/regulator/max8997.c +++ b/trunk/drivers/regulator/max8997.c @@ -278,9 +278,7 @@ static int max8997_reg_is_enabled(struct regulator_dev *rdev) u8 val; ret = max8997_get_enable_register(rdev, ®, &mask, &pattern); - if (ret == -EINVAL) - return 1; /* "not controllable" */ - else if (ret) + if (ret) return ret; ret = max8997_read_reg(i2c, reg, &val); @@ -887,7 +885,6 @@ static struct regulator_ops max8997_charger_ops = { }; static struct regulator_ops max8997_charger_fixedstate_ops = { - .is_enabled = max8997_reg_is_enabled, .get_current_limit = max8997_get_current_limit, .set_current_limit = max8997_set_current_limit, };