summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2019-11-12 16:47:08 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-25 09:51:56 +0100
commit2d7d639e7b72d40ecb81ca9a4f09c57a0a574197 (patch)
tree654a5bfb2c0f3e3b1ef19938eac5e61fa386240f /drivers/input
parent23eb66fb194d53f239485620d74c7dbb3a267072 (diff)
Input: synaptics-rmi4 - clear IRQ enables for F54
commit 549766ac2ac1f6c8bb85906bbcea759541bb19a2 upstream. The driver for F54 just polls the status and doesn't even have a IRQ handler registered. Make sure to disable all F54 IRQs, so we don't crash the kernel on a nonexistent handler. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Link: https://lore.kernel.org/r/20191105114402.6009-1-l.stach@pengutronix.de Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/rmi4/rmi_f54.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c
index d8e5205e8975..b83969020641 100644
--- a/drivers/input/rmi4/rmi_f54.c
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -617,7 +617,7 @@ static int rmi_f54_config(struct rmi_function *fn)
{
struct rmi_driver *drv = fn->rmi_dev->driver;
- drv->set_irq_bits(fn->rmi_dev, fn->irq_mask);
+ drv->clear_irq_bits(fn->rmi_dev, fn->irq_mask);
return 0;
}