hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: synaptics-rmi4 - fix handling failures from rmi_enable_sensor 

If rmi_enable_sensor() fails in rmi_driver_probe(), we should not return
immediately, but disable IRQs and tear down function list.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2017-03-24 14:28:28 -07:00
parent f6c4442bfa
commit 8cf0adf2f8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/input/rmi4/rmi_driver.c
View File

@ -1234,16 +1234,21 @@ static int rmi_driver_probe(struct device *dev)
if (retval < 0)
goto err_destroy_functions;
if (data->f01_container->dev.driver)
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
return rmi_enable_sensor(rmi_dev);
retval = rmi_enable_sensor(rmi_dev);
if (retval)
goto err_disable_irq;
}
return 0;
err_disable_irq:
rmi_disable_irq(rmi_dev, false);
err_destroy_functions:
rmi_free_function_list(rmi_dev);
err:
return retval < 0 ? retval : 0;
return retval;
}
static struct rmi_driver rmi_physical_driver = {