From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3FC27C17448 for ; Wed, 13 Nov 2019 01:57:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F1B22245C for ; Wed, 13 Nov 2019 01:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610255; bh=1QkygwHLgUK427ey0VFiRVmTUIOw5qNV4Wt+zMKwblg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EJPi4brU+ODRh/tqFLt5FgJoWxuCLqhbjg1gajnsBQV3pFkXZzCeNe00ajOT0YS2s iJdQpuuNNiBTpptAfR+e6aAfTSZLx4CpfnvmbFmC2S8ei4vw+pJmKVyvXohcCbzR3m ywzNRbd5qnNyAZWQlZ50RKctvtfNxHLkN7YiaA3s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbfKMB5d (ORCPT ); Tue, 12 Nov 2019 20:57:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:50650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729809AbfKMB52 (ORCPT ); Tue, 12 Nov 2019 20:57:28 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B440222CF; Wed, 13 Nov 2019 01:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610247; bh=1QkygwHLgUK427ey0VFiRVmTUIOw5qNV4Wt+zMKwblg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bCTancK6xTTzv4B4WILGeOqBjlaG1U8xbZBSYhow3R/BEKhlCuOmyX7VC/ShgqhFm PDS3yM0DR2PXNj2t2IF7fmCzSe+VCp7glwg3qG7rmGPFweP2z/d8RLVkFjc2o7/ov4 11krrfDVquHBFZw3VGmzjUIyTDXO+AbBfioOQsgw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Jason Gunthorpe , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 045/115] IB/mthca: Fix error return code in __mthca_init_one() Date: Tue, 12 Nov 2019 20:55:12 -0500 Message-Id: <20191113015622.11592-45-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015622.11592-1-sashal@kernel.org> References: <20191113015622.11592-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 39f2495618c5e980d2873ea3f2d1877dd253e07a ] Fix to return a negative error code from the mthca_cmd_init() error handling case instead of 0, as done elsewhere in this function. Fixes: 80fd8238734c ("[PATCH] IB/mthca: Encapsulate command interface init") Signed-off-by: Wei Yongjun Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mthca/mthca_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c index e36a9bc52268d..ccf50dafce9ca 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/drivers/infiniband/hw/mthca/mthca_main.c @@ -986,7 +986,8 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type) goto err_free_dev; } - if (mthca_cmd_init(mdev)) { + err = mthca_cmd_init(mdev); + if (err) { mthca_err(mdev, "Failed to init command interface, aborting.\n"); goto err_free_dev; } -- 2.20.1