diff options
| author | Duson Lin <dusonlin@emc.com.tw> | 2015-03-08 05:57:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-08 06:11:51 +0100 |
| commit | b3beed7fe83b077291aa32d1f3006c8480f6344b (patch) | |
| tree | 6d45d2181ab82076b92e770243a2d68252688ae1 /drivers/input/mouse/elan_i2c_i2c.c | |
| parent | Input: pwm-beeper - remove unneeded PWM_BEEPER_PM_OPS define (diff) | |
| download | linux-b3beed7fe83b077291aa32d1f3006c8480f6344b.tar.xz linux-b3beed7fe83b077291aa32d1f3006c8480f6344b.zip | |
Input: elan_i2c - return error code when resume fails
In order to better diagnose potential issues let's return error to the
upper layers when resuming the device fails and also add a few diagnostic
messages.
Signed-off-by: Duson Lin <dusonlin@emc.com.tw>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/elan_i2c_i2c.c')
| -rw-r--r-- | drivers/input/mouse/elan_i2c_i2c.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/input/mouse/elan_i2c_i2c.c b/drivers/input/mouse/elan_i2c_i2c.c index 029941f861af..6cf0def6d35e 100644 --- a/drivers/input/mouse/elan_i2c_i2c.c +++ b/drivers/input/mouse/elan_i2c_i2c.c @@ -117,7 +117,15 @@ static int elan_i2c_write_cmd(struct i2c_client *client, u16 reg, u16 cmd) int ret; ret = i2c_transfer(client->adapter, &msg, 1); - return ret == 1 ? 0 : (ret < 0 ? ret : -EIO); + if (ret != 1) { + if (ret >= 0) + ret = -EIO; + dev_err(&client->dev, "writing cmd (0x%04x) failed: %d\n", + reg, ret); + return ret; + } + + return 0; } static int elan_i2c_initialize(struct i2c_client *client) |