lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 296/606] Input: synaptics-rmi4 - fix error return code in rmi_driver_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 5caab2da63207d6d631007f592f5219459e3454d ]

    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>
    Link: https://lore.kernel.org/r/20200428134948.78343-1-weiyongjun1@huawei.com
    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 c18e1a25bca6..258d5fe3d395 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;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:23    [W:4.088 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site