diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-10-07 17:47:36 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-10-28 03:30:19 +0100 |
| commit | a69d82b9bdf1e53e94423048e8bda8c5f5a3dd4e (patch) | |
| tree | 0ae915d15ee164e2682f03b636504f05722babc4 /drivers/power | |
| parent | power: bq2415x_charger: Fix memory leak on DTS parsing error (diff) | |
| download | linux-a69d82b9bdf1e53e94423048e8bda8c5f5a3dd4e.tar.xz linux-a69d82b9bdf1e53e94423048e8bda8c5f5a3dd4e.zip | |
power_supply: Add no_thermal property to prevent recursive get_temp calls
Add a 'no_thermal' property to the power supply class. If true then
thermal zone won't be created for this power supply in
power_supply_register().
Power supply drivers may want to set it if they support
POWER_SUPPLY_PROP_TEMP and they are forwarding this get property call to
other thermal zone.
If they won't set it lockdep may report false positive deadlock for
thermal zone's mutex because of nested calls to thermal_zone_get_temp().
First is the call to thermal_zone_get_temp() of the driver's thermal
zone. Thermal core gets POWER_SUPPLY_PROP_TEMP property from this
driver. The driver then calls other thermal zone thermal_zone_get_temp()
and returns result.
Example of such driver is charger manager.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/power_supply_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 6cb7fe5c022d..694e8cddd5c1 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -417,6 +417,9 @@ static int psy_register_thermal(struct power_supply *psy) { int i; + if (psy->no_thermal) + return 0; + /* Register battery zone device psy reports temperature */ for (i = 0; i < psy->num_properties; i++) { if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { |