diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-19 12:57:49 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-11 17:41:53 -0700 |
| commit | c5928551fd41b2eecdad78fa2be2a4a13ed5fde9 (patch) | |
| tree | e6f8e725e127fb6cb4815b62b5a1e334f9dc217e /drivers/input | |
| parent | c3f6f8612bdab5959950a58291bd61d1d42d996b (diff) | |
| download | linux-c5928551fd41b2eecdad78fa2be2a4a13ed5fde9.tar.gz linux-c5928551fd41b2eecdad78fa2be2a4a13ed5fde9.tar.bz2 linux-c5928551fd41b2eecdad78fa2be2a4a13ed5fde9.zip | |
Input: elan_i2c - check if device is there before really probing
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.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index d5ab9ddef3e3..551ad2934fa7 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1077,6 +1077,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) |