From patchwork Tue Sep 29 11:00:04 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: 290834 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 C9013C4727F for ; Tue, 29 Sep 2020 12:27:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 690F420848 for ; Tue, 29 Sep 2020 12:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382423; bh=2gWGb64OjKY/6l98uZGTJwJF9P96AGvSafutQLgCiGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LipqlHhZSKRrxasUQpH2WT60Cxc6nWYm/0rN0mj4LUBcWTUYVopeXIIv02qREuwCE aRbLUmoz81MOvIXmvORxzGcMIi7I+vgWxnk3sCfHxpHn0J0+EtNjlH2Tqr+51YPOY8 /SPEbIfkQ9JdphIdC8BoTR3FEG6uBWHeLmT3R9Rc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732473AbgI2M1C (ORCPT ); Tue, 29 Sep 2020 08:27:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:50012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729653AbgI2Ldb (ORCPT ); Tue, 29 Sep 2020 07:33:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6653E23BA9; Tue, 29 Sep 2020 11:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378825; bh=2gWGb64OjKY/6l98uZGTJwJF9P96AGvSafutQLgCiGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V2xZdk5E+IYplsLq2rcMH+toCtdwdN5GvxiIbEMlMrlL9wZlHaPBbH6BZT/KJTLl5 +16fIwFaPQ9d3s6SmFSVCtjnN6U7TDgxlGry0F+NOXi0jPaYk9DX/Dn2D+pBt+UoPr ocYgvUyv7P0rZIya55nQBlt1QA93uy1l/CNW5E5w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Sasha Levin Subject: [PATCH 4.19 153/245] sparc64: vcc: Fix error return code in vcc_probe() Date: Tue, 29 Sep 2020 13:00:04 +0200 Message-Id: <20200929105954.429461472@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Yongjun [ Upstream commit ff62255a2a5c1228a28f2bb063646f948115a309 ] Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Link: https://lore.kernel.org/r/20200427122415.47416-1-weiyongjun1@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/vcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c index 58b454c34560a..10a832a2135e2 100644 --- a/drivers/tty/vcc.c +++ b/drivers/tty/vcc.c @@ -604,6 +604,7 @@ static int vcc_probe(struct vio_dev *vdev, const struct vio_device_id *id) port->index = vcc_table_add(port); if (port->index == -1) { pr_err("VCC: no more TTY indices left for allocation\n"); + rv = -ENOMEM; goto free_ldc; }