From: Chuhong Yuan <hslester96@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Chuhong Yuan <hslester96@gmail.com>,
linux-kernel@vger.kernel.org,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
linux-input@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] Input: stmfts - add missed input_unregister_device
Date: Thu, 7 May 2020 23:11:47 +0800 [thread overview]
Message-ID: <20200507151147.792578-1-hslester96@gmail.com> (raw)
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.
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
drivers/input/touchscreen/stmfts.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index b6f95f20f924..4345aa98a320 100644
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -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;
}
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2020-05-07 15:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 15:11 Chuhong Yuan [this message]
2020-05-07 16:01 ` [PATCH] Input: stmfts - add missed input_unregister_device Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507151147.792578-1-hslester96@gmail.com \
--to=hslester96@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).