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/input | |
| parent | ae817e618d4b5d221daae34d32a39476e4bdcb36 (diff) | |
| parent | 85b52122e5426e15602c0b979012e50d7271ea1a (diff) | |
Merge back Intel thermal driver changes for 6.4-rc1.
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/sun4i-ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index 73eb8f80be6e..1117fba30020 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -194,7 +194,7 @@ static int sun4i_get_temp(const struct sun4i_ts_data *ts, int *temp) static int sun4i_get_tz_temp(struct thermal_zone_device *tz, int *temp) { - return sun4i_get_temp(tz->devdata, temp); + return sun4i_get_temp(thermal_zone_device_priv(tz), temp); } static const struct thermal_zone_device_ops sun4i_ts_tz_ops = { |