Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1637801

[PATCH v2] Input: elan_i2c - check if device is there before really probing

Show all headers | View raw

Before trying to properly initialize the touchpad and generate bunch of
errors, let's first see it there is anything at the given address. If we
get error, fail silently with -ENXIO.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

v2: switched over to i2c_smbus_read_byte() as Guenter suggested

 drivers/input/mouse/elan_i2c_core.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 5d3b53dd2fa2..3b616cb7c67f 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1091,6 +1091,13 @@ static int elan_probe(struct i2c_client *client,
 		return error;
 	}
 
+	/* Make sure there is something at this address */
+	error = i2c_smbus_read_byte(client);
+	if (error < 0) {
+		dev_dbg(&client->dev, "nothing at this address: %d\n", error);
+		return -ENXIO;
+	}
+
 	/* Initialize the touchpad. */
 	error = elan_initialize(data);
 	if (error)
-- 
2.13.0.rc2.291.g57267f2277-goog


-- 
Dmitry

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] Input: elan_i2c - check if device is there before really  probing Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-09 02:50 +0200
  Re: [PATCH v2] Input: elan_i2c - check if device is there before  really probing Fabio Estevam <festevam@gmail.com> - 2017-05-09 03:50 +0200
    Re: [PATCH v2] Input: elan_i2c - check if device is there before  really probing Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-05-10 02:50 +0200
      Re: [PATCH v2] Input: elan_i2c - check if device is there before  really probing Fabio Estevam <festevam@gmail.com> - 2017-05-10 03:00 +0200

csiph-web