linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chuhong Yuan <hslester96@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Chuhong Yuan <hslester96@gmail.com>
Subject: [PATCH] Input: s6sy761 - add missed input_unregister_device
Date: Thu,  7 May 2020 23:11:15 +0800	[thread overview]
Message-ID: <20200507151115.792516-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/s6sy761.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/s6sy761.c b/drivers/input/touchscreen/s6sy761.c
index b63d7fdf0cd2..cd8a7bd9be1e 100644
--- a/drivers/input/touchscreen/s6sy761.c
+++ b/drivers/input/touchscreen/s6sy761.c
@@ -464,21 +464,28 @@ static int s6sy761_probe(struct i2c_client *client,
 					IRQF_TRIGGER_LOW | IRQF_ONESHOT,
 					"s6sy761_irq", sdata);
 	if (err)
-		return err;
+		goto err_unregister;
 
 	err = devm_device_add_group(&client->dev, &s6sy761_attribute_group);
 	if (err)
-		return err;
+		goto err_unregister;
 
 	pm_runtime_enable(&client->dev);
 
 	return 0;
+
+err_unregister:
+	input_unregister_device(sdata->input);
+	return err;
 }
 
 static int s6sy761_remove(struct i2c_client *client)
 {
+	struct s6sy761_data *sdata = i2c_get_clientdata(client);
+
 	pm_runtime_disable(&client->dev);
 
+	input_unregister_device(sdata->input);
 	return 0;
 }
 
-- 
2.26.2


             reply	other threads:[~2020-05-07 15:11 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:00 ` [PATCH] Input: s6sy761 - 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=20200507151115.792516-1-hslester96@gmail.com \
    --to=hslester96@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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).