summaryrefslogtreecommitdiffstats
path: root/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
commit8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch)
treee2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
parent430af957008fa73bd81840a407110ed7a979ae02 (diff)
downloadkernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch')
-rw-r--r--0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
index 57174c6f4..7804610d1 100644
--- a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
+++ b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
@@ -22,7 +22,7 @@ Signed-off-by: Lyude <lyude@redhat.com>
3 files changed, 75 insertions(+), 114 deletions(-)
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
-index 7f41213d5ae3..86a23ede344c 100644
+index 8cffa84c9650..6c4e3675601a 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -322,19 +322,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
@@ -45,7 +45,7 @@ index 7f41213d5ae3..86a23ede344c 100644
return 1;
}
-@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
+@@ -592,56 +585,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
.reset = rmi_hid_reset,
};
@@ -102,7 +102,7 @@ index 7f41213d5ae3..86a23ede344c 100644
static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
struct rmi_data *data = NULL;
-@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -714,18 +657,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
mutex_init(&data->page_mutex);