Add patch to fix touchpad issues on Razer machines (rhbz 1227891)
This commit is contained in:
parent
f7efdbdd4d
commit
82e1eb9643
|
@ -0,0 +1,44 @@
|
|||
From: Andrew Duggan <aduggan@synaptics.com>
|
||||
Date: Tue, 16 Jun 2015 14:08:41 -0700
|
||||
Subject: [PATCH] HID: rmi: Disable populating F30 when the touchpad has
|
||||
physical buttons
|
||||
|
||||
Physical buttons do not use F30 to report their state and in some cases the
|
||||
data reported in F30 is incorrect and inconsistent with what is reported by
|
||||
the HID descriptor. When physical buttons are present, ignore F30 and let
|
||||
hid-input report buttons based on what is defined in the HID descriptor.
|
||||
|
||||
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
|
||||
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||||
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
||||
---
|
||||
drivers/hid/hid-rmi.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
|
||||
index 49d4fe4f5987..702aafe30d11 100644
|
||||
--- a/drivers/hid/hid-rmi.c
|
||||
+++ b/drivers/hid/hid-rmi.c
|
||||
@@ -850,6 +850,7 @@ static int rmi_populate_f30(struct hid_device *hdev)
|
||||
|
||||
static int rmi_populate(struct hid_device *hdev)
|
||||
{
|
||||
+ struct rmi_data *data = hid_get_drvdata(hdev);
|
||||
int ret;
|
||||
|
||||
ret = rmi_scan_pdt(hdev);
|
||||
@@ -864,9 +865,11 @@ static int rmi_populate(struct hid_device *hdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
- ret = rmi_populate_f30(hdev);
|
||||
- if (ret)
|
||||
- hid_warn(hdev, "Error while initializing F30 (%d).\n", ret);
|
||||
+ if (!(data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)) {
|
||||
+ ret = rmi_populate_f30(hdev);
|
||||
+ if (ret)
|
||||
+ hid_warn(hdev, "Error while initializing F30 (%d).\n", ret);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -702,6 +702,9 @@ Patch26240: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
|
|||
# CVE-2015-XXXX rhbz 1230770 1230774
|
||||
Patch26241: kvm-x86-fix-kvm_apic_has_events-to-check-for-NULL-po.patch
|
||||
|
||||
# rhbz 1227891
|
||||
Patch26250: HID-rmi-Disable-populating-F30-when-the-touchpad-has.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
@ -1519,6 +1522,9 @@ ApplyPatch Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
|
|||
# CVE-2015-XXXX rhbz 1230770 1230774
|
||||
ApplyPatch kvm-x86-fix-kvm_apic_has_events-to-check-for-NULL-po.patch
|
||||
|
||||
#rhbz 1227891
|
||||
ApplyPatch HID-rmi-Disable-populating-F30-when-the-touchpad-has.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -2369,6 +2375,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Jun 18 2015 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Add patch to fix touchpad issues on Razer machines (rhbz 1227891)
|
||||
|
||||
* Fri Jun 12 2015 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- CVE-2015-XXXX kvm: NULL ptr deref in kvm_apic_has_events (rhbz 1230770 1230774)
|
||||
|
||||
|
|
Loading…
Reference in New Issue