diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-02-07 13:00:37 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-07 17:23:43 -0500 |
commit | e78395334ba6034b53e21e09ce8a50c303d130a9 (patch) | |
tree | 8983da37b39ff224aacff78196ac13cb43055f92 | |
parent | a1fbf5bbef025b4844162b3b8868888003a7ee9c (diff) |
Input: synaptics-rmi4 - fix error return code in rmi_probe_interrupts()
Fix to return error code -ENOMEM from the devm_kzalloc() error handling
case instead of 0, as done elsewhere in this function.
Fixes: 6bd0dcfacf28 ("Input: synaptics-rmi4 - factor out functions
from probe")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/rmi4/rmi_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 2aa3cd0fe222..746255830b47 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c | |||
@@ -1062,7 +1062,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data) | |||
1062 | data->irq_memory = devm_kzalloc(dev, size * 4, GFP_KERNEL); | 1062 | data->irq_memory = devm_kzalloc(dev, size * 4, GFP_KERNEL); |
1063 | if (!data->irq_memory) { | 1063 | if (!data->irq_memory) { |
1064 | dev_err(dev, "Failed to allocate memory for irq masks.\n"); | 1064 | dev_err(dev, "Failed to allocate memory for irq masks.\n"); |
1065 | return retval; | 1065 | return -ENOMEM; |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | data->irq_status = data->irq_memory + size * 0; | 1068 | data->irq_status = data->irq_memory + size * 0; |