Skip to contentSkip to conversation

Input: stmfts - add missed input_unregister_device

PATCH In review Chuhong Yuan 2 participants 2 messages May 7, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: stmfts - add missed input_unregister_device

This driver calls input_register_device() in probe, but misses input_unregister_device() in probe failure and remove. Add the missed function calls to fix it.

---
 drivers/input/touchscreen/stmfts.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/input/touchscreen/stmfts.c +6 -1
index b6f95f20f924..4345aa98a320 100644
@@ -728,8 +728,10 @@ static int stmfts_probe(struct i2c_client *client,
 	}
 
 	err = devm_device_add_group(&client->dev, &stmfts_attribute_group);
-	if (err)
+	if (err) {
+		input_unregister_device(sdata->input);
 		return err;
+	}
 
 	pm_runtime_enable(&client->dev);
 	device_enable_async_suspend(&client->dev);
@@ -739,7 +741,10 @@ static int stmfts_probe(struct i2c_client *client,
 
 static int stmfts_remove(struct i2c_client *client)
 {
+	struct stmfts_data *sdata = i2c_get_clientdata(client);
+
 	pm_runtime_disable(&client->dev);
+	input_unregister_device(sdata->input);
 
 	return 0;
 }
Signature · 1 line
2.26.2
maintainer
#1 lore raw
Quoted 3 lines · Chuhong Yuan

This driver calls input_register_device() in probe, but misses input_unregister_device() in probe failure and remove. Add the missed function calls to fix it.

The input device in question is devm-managed and therefore does not need explicit unregistering.

Thanks.

Signature · 1 line
Dmitry