Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f0850e1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fec-clean-up-in-the-cases-of-probe-error' 



Fugang Duan says:

====================
net: fec: clean up in the cases of probe error

The simple patches just clean up in the cases of probe error like restore dev_id and
handle the defer probe when regulator is still not ready.

v2:
* Fabio Estevam's comment to suggest split v1 to separate patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f1c8d372 3f38c683

drivers/net/ethernet/freescale/fec_main.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -3469,6 +3469,10 @@ fec_probe(struct platform_device *pdev) 
			goto failed_regulator;

			goto failed_regulator;

		}

		}

	} else {

	} else {

		if (PTR_ERR(fep->reg_phy) == -EPROBE_DEFER) {

			ret = -EPROBE_DEFER;

			goto failed_regulator;

		}

		fep->reg_phy = NULL;

		fep->reg_phy = NULL;

	}

	}
@@ -3556,6 +3560,7 @@ fec_probe(struct platform_device *pdev) 
	of_node_put(phy_node);

	of_node_put(phy_node);

failed_ioremap:

failed_ioremap:

	free_netdev(ndev);

	free_netdev(ndev);

	dev_id--;





	return ret;

	return ret;

}

}