From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 20 Nov 2020 03:08:46 +0000 (-0800)
Subject: Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: howlett/maple_spf/20210104~359^2~221
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56495a2442a47d0ea752db62434913b3346fe5a5;p=users%2Fjedix%2Flinux-maple.git

Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

56495a2442a47d0ea752db62434913b3346fe5a5
diff --cc drivers/atm/nicstar.c
index a602e6b96ff7,09ad73361879..5c7e4df159b9
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@@ -1706,8 -1704,10 +1706,10 @@@ static int _ns_send(struct atm_vcc *vcc
  		scq = card->scq0;
  	}
  
 -	if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
 +	if (push_scqe(card, vc, scq, &scqe, skb, may_sleep) != 0) {
  		atomic_inc(&vcc->stats->tx_err);
+ 		dma_unmap_single(&card->pcidev->dev, NS_PRV_DMA(skb), skb->len,
+ 				 DMA_TO_DEVICE);
  		dev_kfree_skb_any(skb);
  		return -EIO;
  	}
diff --cc drivers/net/ethernet/faraday/ftgmac100.c
index 983b6db2d80d,80fb1f537bb3..88bfe2107938
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@@ -1923,9 -1906,9 +1923,11 @@@ static int ftgmac100_probe(struct platf
  err_register_netdev:
  	clk_disable_unprepare(priv->rclk);
  	clk_disable_unprepare(priv->clk);
 +err_phy_connect:
 +	ftgmac100_phy_disconnect(netdev);
  err_ncsi_dev:
+ 	if (priv->ndev)
+ 		ncsi_unregister_dev(priv->ndev);
  	ftgmac100_destroy_mdio(netdev);
  err_setup_mdio:
  	iounmap(priv->base);