diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-31 19:32:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-03-31 19:32:43 +0200 |
| commit | d4d8516624e1042d33011cf93b6e9c220a22c9f0 (patch) | |
| tree | 363a530076d20796032f24cef6774e66e573cd37 /drivers/power | |
| parent | ae817e618d4b5d221daae34d32a39476e4bdcb36 (diff) | |
| parent | 85b52122e5426e15602c0b979012e50d7271ea1a (diff) | |
Merge back Intel thermal driver changes for 6.4-rc1.
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/power_supply_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index f3d7c1da299f..5bf35025cd90 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -1142,7 +1142,7 @@ static int power_supply_read_temp(struct thermal_zone_device *tzd, int ret; WARN_ON(tzd == NULL); - psy = tzd->devdata; + psy = thermal_zone_device_priv(tzd); ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &val); if (ret) return ret; |