netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	"David S . Miller" <davem@davemloft.net>,
	Sasha Levin <sashal@kernel.org>,
	rmody@marvell.com, GR-Linux-NIC-Dev@marvell.com, kuba@kernel.org,
	netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 23/24] bnx2: Fix an error message
Date: Wed,  9 Mar 2022 11:19:42 -0500	[thread overview]
Message-ID: <20220309161946.136122-23-sashal@kernel.org> (raw)
In-Reply-To: <20220309161946.136122-1-sashal@kernel.org>

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

[ Upstream commit 8ccffe9ac3239e549beaa0a9d5e1a1eac94e866c ]

Fix an error message and report the correct failing function.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/broadcom/bnx2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 8c83973adca5..9d70d908c064 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8212,7 +8212,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 		rc = dma_set_coherent_mask(&pdev->dev, persist_dma_mask);
 		if (rc) {
 			dev_err(&pdev->dev,
-				"pci_set_consistent_dma_mask failed, aborting\n");
+				"dma_set_coherent_mask failed, aborting\n");
 			goto err_out_unmap;
 		}
 	} else if ((rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) != 0) {
-- 
2.34.1


      parent reply	other threads:[~2022-03-09 16:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20220309161946.136122-1-sashal@kernel.org>
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 02/24] xfrm: Check if_id in xfrm_migrate Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 03/24] xfrm: Fix xfrm migrate issues when address family changes Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 10/24] mac80211: refuse aggregations sessions before authorized Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 13/24] Bluetooth: hci_core: Fix leaking sent_cmd skb Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 14/24] can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 15/24] net: sparx5: Add #include to remove warning Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 16/24] atm: firestream: check the return value of ioremap() in fs_init() Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 18/24] iwlwifi: don't advertise TWT support Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 20/24] nl80211: Update bss channel on channel switch for P2P_CLIENT Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 21/24] tcp: make tcp_read_sock() more robust Sasha Levin
2022-03-09 16:19 ` [PATCH AUTOSEL 5.15 22/24] sfc: extend the locking on mcdi->seqno Sasha Levin
2022-03-09 16:19 ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220309161946.136122-23-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=GR-Linux-NIC-Dev@marvell.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rmody@marvell.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).