diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2014-04-14 14:53:35 +0530 |
---|---|---|
committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-05 11:06:53 -0700 |
commit | 4d7e8a3a384141e6d917a356829bec82005b70a8 (patch) | |
tree | 2934f8249336a644eafed3957ba263c452b03cf2 /drivers/power | |
parent | 299583f63a93fe4c2e6c1475b3682b8ed62b9427 (diff) |
power: battery-charger-gauge: battery temp monitoring by gauge if tz provided
If tz_name is provided by gauge driver then only register thermal zone
for battery temperature monitor.
Change-Id: I89af50b96c9c9ffd00e5da1397e9616599af9a9b
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/395807
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: I0c2784880f98b2ea4f0683c367483782c24cc5f6
Reviewed-on: http://git-master/r/404461
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/battery-charger-gauge-comm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/battery-charger-gauge-comm.c b/drivers/power/battery-charger-gauge-comm.c index 3b615bcc82bb..764fde8f2a36 100644 --- a/drivers/power/battery-charger-gauge-comm.c +++ b/drivers/power/battery-charger-gauge-comm.c @@ -611,12 +611,13 @@ struct battery_gauge_dev *battery_gauge_register(struct device *dev, bg_dev->ops = bgi->bg_ops; bg_dev->parent_dev = dev; bg_dev->drv_data = drv_data; - bg_dev->tz_name = kstrdup(bgi->tz_name, GFP_KERNEL); + bg_dev->tz_name = NULL; if (bgi->current_channel_name) bg_dev->bat_curr_channel_name = bgi->current_channel_name; - if (bg_dev->tz_name) { + if (bgi->tz_name) { + bg_dev->tz_name = kstrdup(bgi->tz_name, GFP_KERNEL); bg_dev->battery_tz = thermal_zone_device_find_by_name( bg_dev->tz_name); if (!bg_dev->battery_tz) |