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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1C71C4332F for ; Mon, 25 Oct 2021 17:00:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97C1E60F9D for ; Mon, 25 Oct 2021 17:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234317AbhJYRDD (ORCPT ); Mon, 25 Oct 2021 13:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:55064 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234272AbhJYRCh (ORCPT ); Mon, 25 Oct 2021 13:02:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 967F760FDC; Mon, 25 Oct 2021 17:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635181214; bh=Zi+X0CHUBXp8Eeb2+fbHZbqEmRXZzxKBUizEuKnew4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jp0+jNv3Y+BZdKQIRcH6HmRyVKmYNsa2g43/0iS6SPxocQEb7PmF7z+i9QWcu9XH0 oIYI3o6UkCmyEV4yPNPykMUtFT8CYZT4Py1TrB5wbZjAYkxO9BCP9EwIvCDTjRXkFl nXVy0wV4bvYaw2hs6NM9NjCwai2hfq8MQVxtkXdFbOlAERcwkcYz1CyEKeAHxFLT9r NnXKVTZrV+8lZWh0XdpIQ4VaoRp/gCwaFO9I2pT9xWIQr/I/AYdztBGctPtS2yTStl qlpp9d6C6pkVYv0k8iK1XDmlaSq7DHn5p9VNt2IolqN+ij+kxy16Cyv/OSSBNxrEVE G8MBcPQRt/4dg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , "David S . Miller" , Sasha Levin , sgoutham@marvell.com, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 13/18] cavium: Fix return values of the probe function Date: Mon, 25 Oct 2021 12:59:26 -0400 Message-Id: <20211025165939.1393655-13-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211025165939.1393655-1-sashal@kernel.org> References: <20211025165939.1393655-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheyu Ma [ Upstream commit c69b2f46876825c726bd8a97c7fa852d8932bc32 ] During the process of driver probing, the probe function should return < 0 for failure, otherwise, the kernel will treat value > 0 as success. Signed-off-by: Zheyu Ma Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index e2b290135fd9..a61107e05216 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -1224,7 +1224,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) if (ret < 0) { netdev_err(nic->netdev, "Req for #%d msix vectors failed\n", nic->num_vec); - return 1; + return ret; } sprintf(nic->irq_name[irq], "%s Mbox", "NICVF"); @@ -1243,7 +1243,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) if (!nicvf_check_pf_ready(nic)) { nicvf_disable_intr(nic, NICVF_INTR_MBOX, 0); nicvf_unregister_interrupts(nic); - return 1; + return -EIO; } return 0; -- 2.33.0