| Message ID | 20191210091401.23388-1-hslester96@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 97e24b095348a15ec08c476423c3b3b939186ad7 |
| Headers | show |
| Series | Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register | expand |
On Tue, Dec 10, 2019 at 05:14:01PM +0800, Chuhong Yuan wrote: > The driver misses a check for devm_thermal_zone_of_sensor_register(). > Add a check to fix it. > > Fixes: e28d0c9cd381 ("input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register") > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Applied, thank you. > --- > drivers/input/touchscreen/sun4i-ts.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c > index 0af0fe8c40d7..742a7e96c1b5 100644 > --- a/drivers/input/touchscreen/sun4i-ts.c > +++ b/drivers/input/touchscreen/sun4i-ts.c > @@ -237,6 +237,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; > @@ -355,7 +356,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); > > -- > 2.24.0 >
diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index 0af0fe8c40d7..742a7e96c1b5 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -237,6 +237,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; @@ -355,7 +356,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);
The driver misses a check for devm_thermal_zone_of_sensor_register(). Add a check to fix it. Fixes: e28d0c9cd381 ("input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register") Signed-off-by: Chuhong Yuan <hslester96@gmail.com> --- drivers/input/touchscreen/sun4i-ts.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)