Commit 98d7ca2a authored Apr 28, 2020 by Wei Yongjun Committed by Greg Kroah-Hartman Jun 03, 2020

Input: synaptics-rmi4 - fix error return code in rmi_driver_probe()



[ 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>

parent 54969e54

drivers/input/rmi4/rmi_driver.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1213,7 +1213,8 @@ static int rmi_driver_probe(struct device *dev)
	if (data->input) {		if (data->input) {
	rmi_driver_set_input_name(rmi_dev, data->input);		rmi_driver_set_input_name(rmi_dev, data->input);
	if (!rmi_dev->xport->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",		dev_err(dev, "%s: Failed to register input device.\n",
	__func__);		__func__);
	goto err_destroy_functions;		goto err_destroy_functions;