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=-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,URIBL_BLOCKED,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 350E9C432C0 for ; Fri, 22 Nov 2019 11:24:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 041F120679 for ; Fri, 22 Nov 2019 11:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421875; bh=7Oz3PQNUNgCniA01lkUK3vBCs4s5pP39V23TBiRS1qQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dXt2xZ6ghyfW+MynwobO65NakMlKoj2C1wg0ac2SK2F/kBN5S9rJ6Zq8M/J88l4Xe hJPexFSdnJb7WONfu3oaea5dAqDXQBXpnzAt+t9QpvJG8ov2++ots73q+ZQUORja5e PYjqbzVFHzgqkUgDN6BrjZ4nz5SNXqwoTgHwLBAE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728703AbfKVKiu (ORCPT ); Fri, 22 Nov 2019 05:38:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:41346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727561AbfKVKip (ORCPT ); Fri, 22 Nov 2019 05:38:45 -0500 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 9911320637; Fri, 22 Nov 2019 10:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419124; bh=7Oz3PQNUNgCniA01lkUK3vBCs4s5pP39V23TBiRS1qQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IW72KgJpW8CDJuGzMMlgJ8FX76uVBPZUKG8LAkZbZ1Ixelz5b+0u9HHS0YVU/nutU 9yXP527OnebBrDRci2cS0wHaeNTSJP51xUeZBaB/+wt5MzDANCe7BzY2QmK9JWt4av zG2+MIKi7//bjuUHlN+IBiz+YzzuaPjPqWlef5dY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.4 128/159] IB/mthca: Fix error return code in __mthca_init_one() Date: Fri, 22 Nov 2019 11:28:39 +0100 Message-Id: <20191122100832.990179210@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 ded76c101dde3..834b06aacc2bf 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/drivers/infiniband/hw/mthca/mthca_main.c @@ -989,7 +989,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