From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Date: Tue, 28 Apr 2020 13:49:48 +0000 Subject: [PATCH -next] Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Message-Id: <20200428134948.78343-1-weiyongjun1@huawei.com> List-Id: References: <6cdcc804be73a5e3bb6e8d70ab86dc716c5cc720.camel@redhat.com> In-Reply-To: <6cdcc804be73a5e3bb6e8d70ab86dc716c5cc720.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dmitry Torokhov , Thomas Gleixner , Kate Stewart , Greg Kroah-Hartman , Andrew Duggan , Evan Green Cc: Wei Yongjun , linux-input@vger.kernel.org, kernel-janitors@vger.kernel.org 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 --- 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;