summaryrefslogtreecommitdiffstats
path: root/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
diff options
context:
space:
mode:
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.patch8
1 files changed, 4 insertions, 4 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 1a7ce3ff3..4d7bef554 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
@@ -122,7 +122,7 @@ index 8cffa84c9650..6c4e3675601a 100644
data->xport.ops = &hid_rmi_ops;
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
-index 190b9974526b..27a65991de0e 100644
+index 258d5fe3d395..f7298e3dc8f3 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status,
@@ -165,10 +165,10 @@ index 190b9974526b..27a65991de0e 100644
- if (count) {
- kfree(attn_data.data);
-- attn_data.data = NULL;
+- drvdata->attn_data.data = NULL;
- }
+ kfree(attn_data.data);
-+ attn_data.data = NULL;
++ drvdata->attn_data.data = NULL;
if (!kfifo_is_empty(&drvdata->attn_fifo))
- return rmi_irq_fn(irq, dev_id);
@@ -294,7 +294,7 @@ index 190b9974526b..27a65991de0e 100644
rmi_f34_remove_sysfs(rmi_dev);
rmi_free_function_list(rmi_dev);
-@@ -1218,9 +1236,15 @@ static int rmi_driver_probe(struct device *dev)
+@@ -1219,9 +1237,15 @@ static int rmi_driver_probe(struct device *dev)
}
}