From patchwork Mon Jun 1 17:53:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 447F8C433E0 for ; Mon, 1 Jun 2020 18:52:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11C2420679 for ; Mon, 1 Jun 2020 18:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037547; bh=h1SEnG/p5NsSGvaCtGkg3XqYg777n43wir3zB7FBzGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oROMlHdObb7tSvOeepwyA5bvZBqf1wwBZuzEsMypbbmFdNhqvfb0yOv5PQJ1H5JYm PRpQEZQolflgIUQJsB3U5fusmxv9VJsnyVnniuFMrYO/N9HnGA1vlDK4Y2mBUa32er ExNT6qKHqG5+1iHOpENTip+DMnNB8xrAtKrOBROQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730690AbgFASwQ (ORCPT ); Mon, 1 Jun 2020 14:52:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729683AbgFASEB (ORCPT ); Mon, 1 Jun 2020 14:04:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BDF1C2074B; Mon, 1 Jun 2020 18:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034640; bh=h1SEnG/p5NsSGvaCtGkg3XqYg777n43wir3zB7FBzGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uzkqo4j+Z9ziN6wFUGo3hP1SxkvyT+HU4ussf0WA/lfRntjbTsHaUBDWQYSuU5wlo mNlhd2nvCRezMtlSylnuKwzvjAV4wqrUxslHct1CMk8pcGhXVqM6OnQoKsRUuZIfzP J6vzSHX+qlefQzjs0cPb59Jx8j44YZOgpUIQjg7U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Dmitry Torokhov , Sasha Levin Subject: [PATCH 4.19 44/95] Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Date: Mon, 1 Jun 2020 19:53:44 +0200 Message-Id: <20200601174027.767195134@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174020.759151073@linuxfoundation.org> References: <20200601174020.759151073@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Yongjun [ 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 Link: https://lore.kernel.org/r/20200428134948.78343-1-weiyongjun1@huawei.com Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- 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 24a1ff34964c..ac6a20f7afdf 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -1213,7 +1213,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;