diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2014-03-14 12:24:14 +0530 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2014-03-14 08:43:55 -0700 |
| commit | ede83e34b7f7274475c1baff87d2a30ee8779b04 (patch) | |
| tree | 8b30dbbe0e33354dd5fb0b8051453491971f3637 /drivers/power | |
| parent | 190a8adb1e9fe5faf730d10f4dbb85cc2ec01175 (diff) | |
power: battery-charger-gauge: Request thermal zone only if tz name valid
Request for the thermal zone only if tz name is provided from gauge driver.
Change-Id: Ie2480eca92f7b10e8bbb0c8ac2ae1a7a81306194
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/381912
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/battery-charger-gauge-comm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/battery-charger-gauge-comm.c b/drivers/power/battery-charger-gauge-comm.c index f8b587a8347e..511509759a6d 100644 --- a/drivers/power/battery-charger-gauge-comm.c +++ b/drivers/power/battery-charger-gauge-comm.c @@ -493,7 +493,7 @@ int battery_gauge_get_battery_temperature(struct battery_gauge_dev *bg_dev, int ret; long temperature; - if (!bg_dev) + if (!bg_dev || !bg_dev->tz_name) return -EINVAL; if (!bg_dev->battery_tz) @@ -548,7 +548,7 @@ struct battery_gauge_dev *battery_gauge_register(struct device *dev, bg_dev->drv_data = drv_data; bg_dev->tz_name = kstrdup(bgi->tz_name, GFP_KERNEL); - if (!bg_dev->tz_name) { + if (bg_dev->tz_name) { bg_dev->battery_tz = thermal_zone_device_find_by_name( bg_dev->tz_name); if (!bg_dev->battery_tz) |