diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-01 22:13:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-01 22:13:38 +0200 |
| commit | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (patch) | |
| tree | f4d83deecb8c546b797e3dbc4c4c0c705a02ffcb /0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch | |
| parent | 9097b7b287480e96d570cb9a344eab15587c4508 (diff) | |
| parent | f0c9dd0c81745d7c1600ecc6ce3d20ba89c2f56e (diff) | |
| download | kernel-5.7.0-1.vanilla.1.fc33.tar.gz kernel-5.7.0-1.vanilla.1.fc33.tar.xz kernel-5.7.0-1.vanilla.1.fc33.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-1.vanilla.1.fc33kernel-5.7.0-1.vanilla.1.fc32kernel-5.7.0-1.vanilla.1.fc31
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 | 8 |
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) } } |