Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- root@vm99:/data/arm# diff linux-wens/drivers/net/ethernet/allwinner/sun8i-emac.c linux-montjoie//drivers/net/ethernet/allwinner/sun8i-emac.c
- 766,767d765
- <
- < /* nothing else to do */
- 1905c1903
- < return -EPROBE_DEFER;
- ---
- > goto probe_err;
- 1915,1916c1913,1916
- < if (PTR_ERR(priv->regulator) == -EPROBE_DEFER)
- < return -EPROBE_DEFER;
- ---
- > if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) {
- > ret = -EPROBE_DEFER;
- > goto probe_err;
- > }
- 1918a1919,1920
- > } else {
- > dev_info(&pdev->dev, "PHY regulator found\n");
- 1924,1925c1926,1929
- < if (PTR_ERR(priv->regulator_io) == -EPROBE_DEFER)
- < return -EPROBE_DEFER;
- ---
- > if (PTR_ERR(priv->regulator_io) == -EPROBE_DEFER) {
- > ret = -EPROBE_DEFER;
- > goto probe_err;
- > }
- 1927a1932,1933
- > } else {
- > dev_info(&pdev->dev, "PHY IO regulator found\n");
Add Comment
Please, Sign In to add comment