diff options
| author | Dmitry Torokhov <[email protected]> | 2021-11-11 21:58:54 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2021-11-11 21:58:54 -0800 |
| commit | efe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch) | |
| tree | ab5a4ac8c5b917b07af95c866770659f330b7f2b /drivers/input/touchscreen/tsc2004.c | |
| parent | a02dcde595f7cbd240ccd64de96034ad91cffc40 (diff) | |
| parent | 744d0090a5f6dfa4c81b53402ccdf08313100429 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'drivers/input/touchscreen/tsc2004.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2004.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c index 0272cedcc726..9fdd870c4c0b 100644 --- a/drivers/input/touchscreen/tsc2004.c +++ b/drivers/input/touchscreen/tsc2004.c @@ -45,7 +45,9 @@ static int tsc2004_probe(struct i2c_client *i2c, static int tsc2004_remove(struct i2c_client *i2c) { - return tsc200x_remove(&i2c->dev); + tsc200x_remove(&i2c->dev); + + return 0; } static const struct i2c_device_id tsc2004_idtable[] = { |