[PATCH 2/3] Input: synaptics-rmi4 - fix the error return code in rmi_probe_interrupts()

Aaron Ma aaron.ma at canonical.com
Wed Dec 4 04:59:45 UTC 2019

From: Wei Yongjun <weiyongjun1 at huawei.com>

BugLink: https://bugs.launchpad.net/bugs/1854798

The error return code PTR_ERR(data->irqdomain) is always 0 since
data->irqdomain is equal to NULL in this error handling case.

Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to irq_domain")
Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
Reviewed-by: Lyude Paul <lyude at redhat.com>
Reviewed-by: Nick Desaulniers <ndesaulniers at google.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
(cherry picked from commit fd629294759b1e6e5dfc0c9bf892e63553dcc6fa)
Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
 drivers/input/rmi4/rmi_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 211832946e68..fb882f6e7abb 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -1043,7 +1043,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
 	if (!data->irqdomain) {
 		dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
-		return PTR_ERR(data->irqdomain);
+		return -ENOMEM;
 	data->irq_count = irq_count;

More information about the kernel-team mailing list