diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:28:46 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:28:46 +0200 |
| commit | e2d39e0f95cb414b1fb6530f8429ad411586922b (patch) | |
| tree | 58ebf7762babc6fd8fd443fde9002cc7aa89202f /drivers/hid/hid-multitouch.c | |
| parent | 108ff0e8012ae10708168940c7474318fb343751 (diff) | |
| parent | 2ddc8e2d2b5902b376fee51585c8eed72b8836e7 (diff) | |
Merge branch 'for-4.17/upstream' into for-linus
Pull a few small generic code cleanups.
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index ba32f0172030..dad2fbb0e3f8 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -731,7 +731,7 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) } if (!(td->mtclass.quirks & MT_QUIRK_CONFIDENCE)) - s->confidence_state = 1; + s->confidence_state = true; active = (s->touch_state || s->inrange_state) && s->confidence_state; |