diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2013-06-25 14:18:14 +0900 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-06-28 18:37:03 -0700 |
| commit | 5a6c2208455f25b3e6f939adc2da59aa00d4806e (patch) | |
| tree | ecde95c291fb8598cfadf24f5245d406abfbc51c | |
| parent | 3cc9d26966ea02f71258ab0553ebd3388f40533a (diff) | |
| download | linux-5a6c2208455f25b3e6f939adc2da59aa00d4806e.tar.bz2 | |
charger-manager: Fix regulator_get() return check
This patch fixes return value checking of regulator_get() in
charger-manager driver. The API, regulator_get(), returns ERR_PTR() when
it fails to get regulator with given name, not NULL.
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
| -rw-r--r-- | drivers/power/charger-manager.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 8ad9698b55a9..e30e847600bb 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -1239,11 +1239,10 @@ static int charger_manager_register_extcon(struct charger_manager *cm) charger->consumer = regulator_get(cm->dev, charger->regulator_name); - if (charger->consumer == NULL) { + if (IS_ERR(charger->consumer)) { dev_err(cm->dev, "Cannot find charger(%s)\n", charger->regulator_name); - ret = -EINVAL; - goto err; + return PTR_ERR(charger->consumer); } charger->cm = cm; |