summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-11-29 22:36:45 +0300
committerJiri Kosina <jkosina@suse.cz>2019-11-29 22:36:45 +0300
commitb49b511f417ada27e5e4a8448bac5337e24f3c39 (patch)
tree3cc90e3262d4bffd0b19d20b9dbf86bdfc85b5e9 /drivers/hid
parent09f5429ddf78477b94f1f3c23063b53f127fbbe6 (diff)
parent4f6585815084dc42089449ff32849b8069ea2604 (diff)
downloadlinux-b49b511f417ada27e5e4a8448bac5337e24f3c39.tar.xz
Merge branch 'for-5.5/i2c' into for-linus
- removal of superfluous delay (You-Sheng Yang)
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/i2c-hid/i2c-hid-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index ac44bf752ff1..a358e61fbc82 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -158,8 +158,6 @@ struct i2c_hid {
bool irq_wake_enabled;
struct mutex reset_lock;
-
- unsigned long sleep_delay;
};
static const struct i2c_hid_quirks {