diff options
| author | Wei Yongjun | 2017-02-07 19:00:37 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2017-02-07 23:23:43 +0100 |
| commit | e78395334ba6034b53e21e09ce8a50c303d130a9 (patch) | |
| tree | 8983da37b39ff224aacff78196ac13cb43055f92 /drivers/input/rmi4 | |
| parent | Input: xpad - restore LED state after device resume (diff) | |
| download | kernel-qcow2-linux-e78395334ba6034b53e21e09ce8a50c303d130a9.tar.gz kernel-qcow2-linux-e78395334ba6034b53e21e09ce8a50c303d130a9.tar.xz kernel-qcow2-linux-e78395334ba6034b53e21e09ce8a50c303d130a9.zip | |
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>
Diffstat (limited to 'drivers/input/rmi4')
| -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) data->irq_memory = devm_kzalloc(dev, size * 4, GFP_KERNEL); if (!data->irq_memory) { dev_err(dev, "Failed to allocate memory for irq masks.\n"); - return retval; + return -ENOMEM; } data->irq_status = data->irq_memory + size * 0; |