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.

bug 1487437

Change-Id: Ie2480eca92f7b10e8bbb0c8ac2ae1a7a81306194
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/381912
(cherry picked from commit ede83e34b7f7274475c1baff87d2a30ee8779b04)
Reviewed-on: http://git-master/r/386971
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>

diff --git a/drivers/power/battery-charger-gauge-comm.c b/drivers/power/battery-charger-gauge-comm.c
index 5837a1e66a9aa2ec7e785c173ffd0f9d6f4fd3f9..2a2f180a053f0e5251a6de2413235e556b14c19c 100644 (file)
--- a/drivers/power/battery-charger-gauge-comm.c
+++ b/drivers/power/battery-charger-gauge-comm.c
@@ -525,7 +525,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)
@@ -580,7 +580,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)