| Message ID | 20200428134948.78343-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5caab2da63207d6d631007f592f5219459e3454d |
| Headers | show |
| Series | [-next] Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() | expand |
On Tue, Apr 28, 2020 at 01:49:48PM +0000, Wei Yongjun wrote: > Fix to return a negative error code from the input_register_device() > error handling case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied, thank you. > --- > drivers/input/rmi4/rmi_driver.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c > index 190b9974526b..bfc08d7b25d0 100644 > --- a/drivers/input/rmi4/rmi_driver.c > +++ b/drivers/input/rmi4/rmi_driver.c > @@ -1210,7 +1210,8 @@ static int rmi_driver_probe(struct device *dev) > if (data->input) { > rmi_driver_set_input_name(rmi_dev, data->input); > if (!rmi_dev->xport->input) { > - if (input_register_device(data->input)) { > + retval = input_register_device(data->input); > + if (retval) { > dev_err(dev, "%s: Failed to register input device.\n", > __func__); > goto err_destroy_functions; > > >
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 190b9974526b..bfc08d7b25d0 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -1210,7 +1210,8 @@ static int rmi_driver_probe(struct device *dev) if (data->input) { rmi_driver_set_input_name(rmi_dev, data->input); if (!rmi_dev->xport->input) { - if (input_register_device(data->input)) { + retval = input_register_device(data->input); + if (retval) { dev_err(dev, "%s: Failed to register input device.\n", __func__); goto err_destroy_functions;
Fix to return a negative error code from the input_register_device() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/input/rmi4/rmi_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)