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 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 04FEBC433FE for ; Mon, 25 Oct 2021 17:02:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBD2E60187 for ; Mon, 25 Oct 2021 17:02:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CBD2E60187 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pwJ5NSJCoUNKVA3m7bza5U4IAoDEBJFSTQX6QyMAw/c=; b=tEGAquzd3SJn76 cg1mojnT6DbofS98uRruPpGLl2ZTzzxacf6wia5VkapxJSDbeqnBWpa4SisS692ld98SjV3oP5Ba/ rMniEWN8+9ZF2fBAKK4GTMzlm8b6HnxseDMtEj9OMuEimIECv2Ve2sf/Gxmhjh/cyFPqox7sxZBAr R6O6VSrnYkABXDW1AH6CJkiFLvBgZPwuZPDJOiPvLyhmpyNMe2t2Ee6ESCQTImeTe9WFxXSp0KM9D XyRH3/jFKUublZNgu1GlCvmyh9qFf/G52np1+gTCskaBIIgjys1NyBJYmQIyoTbvEMV/0r+vknWHQ AFEHzesY3I07o9ZYjt5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mf3Kz-00H8WX-NJ; Mon, 25 Oct 2021 17:00:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mf3KY-00H8Ln-Qs for linux-arm-kernel@lists.infradead.org; Mon, 25 Oct 2021 17:00:16 +0000 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211025_100014_960785_1EF0509D X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel