diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 12:28:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 12:28:06 -0700 |
| commit | 6735a1971a00a29a96aa3ea5dc08912bfee95c51 (patch) | |
| tree | 5bb4c18ddf11edae5ab634c130cbf24f355f94df /drivers/platform/x86/peaq-wmi.c | |
| parent | 8c6f5e7359e5bd0616b686dd5e14b99a34103b32 (diff) | |
| parent | c3a73ed8a82b666ac01466d3badd7824eae89c44 (diff) | |
Merge tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull more x86 platform driver updates from Darren Hart:
"Add new platform matches for silead_dmi and ideapad-laptop. Several
constify patches for attribute_group structures. Fixes for peaq-wmi
and intel_telemetry.
silead_dmi:
- Add entry for Ployer Momo7w tablet touchscreen
- Add touchscreen info for I.T.Works TW891 2-in-1
toshiba_acpi:
- constify attribute_group structures.
asus-wmi:
- constify attribute_group structures.
panasonic-laptop:
- constify attribute_group structures.
alienware-wmi:
- constify attribute_group structures.
samsung-laptop:
- constify attribute_group structures.
compal-laptop:
- constify attribute_group structures.
fujitsu-laptop:
- constify attribute_group structures.
- add NULL check on devm_kzalloc() return value
peaq-wmi:
- Fix peaq_ignore_events_counter handling off by 1
ideapad-laptop:
- Fix indentation in DMI table
- Add several models to no_hw_rfkill
- Add IdeaPad V510-15IKB to no_hw_rfkill
intel_telemetry:
- Add debugfs entry for S0ix residency
intel_telemetry_debugfs:
- fix some error codes in init
- fix oops when load/unload module"
* tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: silead_dmi: Add entry for Ployer Momo7w tablet touchscreen
platform/x86: toshiba_acpi: constify attribute_group structures.
platform/x86: asus-wmi: constify attribute_group structures.
platform/x86: panasonic-laptop: constify attribute_group structures.
platform/x86: alienware-wmi: constify attribute_group structures.
platform/x86: samsung-laptop: constify attribute_group structures.
platform/x86: compal-laptop: constify attribute_group structures.
platform/x86: fujitsu-laptop: constify attribute_group structures.
platform/x86: peaq-wmi: Fix peaq_ignore_events_counter handling off by 1
platform/x86: fujitsu-laptop: add NULL check on devm_kzalloc() return value
platform/x86: silead_dmi: Add touchscreen info for I.T.Works TW891 2-in-1
platform/x86: ideapad-laptop: Fix indentation in DMI table
platform/x86: ideapad-laptop: Add several models to no_hw_rfkill
platform/x86: ideapad-laptop: Add IdeaPad V510-15IKB to no_hw_rfkill
platform/x86: intel_telemetry: Add debugfs entry for S0ix residency
platform/x86: intel_telemetry_debugfs: fix some error codes in init
platform/x86: intel_telemetry_debugfs: fix oops when load/unload module
Diffstat (limited to 'drivers/platform/x86/peaq-wmi.c')
| -rw-r--r-- | drivers/platform/x86/peaq-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c index ca75b4dc437e..77d1f90b0794 100644 --- a/drivers/platform/x86/peaq-wmi.c +++ b/drivers/platform/x86/peaq-wmi.c @@ -51,7 +51,7 @@ static void peaq_wmi_poll(struct input_polled_dev *dev) return; } - if (peaq_ignore_events_counter && --peaq_ignore_events_counter > 0) + if (peaq_ignore_events_counter && --peaq_ignore_events_counter >= 0) return; if (obj.integer.value) { |