Commit 3ec3ebec authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rswitch-fixes' 



Yoshihiro Shimoda says:

====================
net: ethernet: renesas: rswitch: Fix minor issues

This patch series is based on v6.2-rc2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 81852018 bd2adfe3

drivers/net/ethernet/renesas/rswitch.c

+9 −1
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ static int rswitch_device_alloc(struct rswitch_private *priv, int index) 
{

	struct platform_device *pdev = priv->pdev;

	struct rswitch_device *rdev;

	struct device_node *port;

	struct net_device *ndev;

	int err;
@@ -1606,7 +1607,9 @@ static int rswitch_device_alloc(struct rswitch_private *priv, int index) 


	netif_napi_add(ndev, &rdev->napi, rswitch_poll);



	err = of_get_ethdev_address(pdev->dev.of_node, ndev);

	port = rswitch_get_port_node(rdev);

	err = of_get_ethdev_address(port, ndev);

	of_node_put(port);

	if (err) {

		if (is_valid_ether_addr(rdev->etha->mac_addr))

			eth_hw_addr_set(ndev, rdev->etha->mac_addr);
@@ -1786,6 +1789,11 @@ static int renesas_eth_sw_probe(struct platform_device *pdev) 
	pm_runtime_get_sync(&pdev->dev);



	ret = rswitch_init(priv);

	if (ret < 0) {

		pm_runtime_put(&pdev->dev);

		pm_runtime_disable(&pdev->dev);

		return ret;

	}



	device_set_wakeup_capable(&pdev->dev, 1);