diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
| commit | be305682f0f037608ba1884e677c56d30877d699 (patch) | |
| tree | 53a33b12b4434182720920a9da81e27d2d40c7ed /0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch | |
| parent | 8646321dee2344a7d6b8c53bc1694c23d6992fe8 (diff) | |
| parent | 13bd6da63cf611a8325774f77a657cf8a6a0fc66 (diff) | |
| download | kernel-be305682f0f037608ba1884e677c56d30877d699.tar.gz kernel-be305682f0f037608ba1884e677c56d30877d699.tar.xz kernel-be305682f0f037608ba1884e677c56d30877d699.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.20200827git15bc20c6af4c.1.vanilla.2.fc32
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.patch | 6 |
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 1556e88da..8107403c2 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 8cffa84c9650..6c4e3675601a 100644 +index 7f41213d5ae3..86a23ede344c 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 8cffa84c9650..6c4e3675601a 100644 return 1; } -@@ -592,56 +585,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { +@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = { .reset = rmi_hid_reset, }; @@ -102,7 +102,7 @@ index 8cffa84c9650..6c4e3675601a 100644 static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) { struct rmi_data *data = NULL; -@@ -714,18 +657,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) +@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id) mutex_init(&data->page_mutex); |