diff options
| author | Mark Brown <broonie@kernel.org> | 2020-04-27 15:04:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-27 15:04:50 +0100 |
| commit | e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620 (patch) | |
| tree | 20f998f15d0df609423c5580a7562ba2d27e3fb8 /drivers/net/ethernet/broadcom/bcmsysport.c | |
| parent | dc234825997ec6ff05980ca9e2204f4ac3f8d695 (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620.tar.gz linux-e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620.tar.bz2 linux-e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620.zip | |
Merge tag 'v5.7-rc3' into spi-5.8
Linux 5.7-rc3
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index af7ce5c5488c..b25356e21a1e 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -664,7 +664,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv, dma_addr_t mapping; /* Allocate a new SKB for a new packet */ - skb = netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH); + skb = __netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH, + GFP_ATOMIC | __GFP_NOWARN); if (!skb) { priv->mib.alloc_rx_buff_failed++; netif_err(priv, rx_err, ndev, "SKB alloc failed\n"); @@ -2475,7 +2476,6 @@ static int bcm_sysport_probe(struct platform_device *pdev) priv->wol_irq = platform_get_irq(pdev, 1); } if (priv->irq0 <= 0 || (priv->irq1 <= 0 && !priv->is_lite)) { - dev_err(&pdev->dev, "invalid interrupts\n"); ret = -EINVAL; goto err_free_netdev; } |