Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d751dc authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman
Browse files

Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register 



commit 97e24b095348a15ec08c476423c3b3b939186ad7 upstream.

The driver misses a check for devm_thermal_zone_of_sensor_register().
Add a check to fix it.

Fixes: e28d0c9c ("input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register")
Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0501a3e

drivers/input/touchscreen/sun4i-ts.c

+5 −1
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ static int sun4i_ts_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct device *hwmon;

	struct thermal_zone_device *thermal;

	int error;

	u32 reg;

	bool ts_attached;
@@ -365,7 +366,10 @@ static int sun4i_ts_probe(struct platform_device *pdev) 
	if (IS_ERR(hwmon))

		return PTR_ERR(hwmon);



	devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, &sun4i_ts_tz_ops);

	thermal = devm_thermal_zone_of_sensor_register(ts->dev, 0, ts,

						       &sun4i_ts_tz_ops);

	if (IS_ERR(thermal))

		return PTR_ERR(thermal);



	writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);