Guest User

Untitled

a guest
Jun 2nd, 2016
88
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.84 KB | None | 0 0
  1. root@vm99:/data/arm# diff linux-wens/drivers/net/ethernet/allwinner/sun8i-emac.c linux-montjoie//drivers/net/ethernet/allwinner/sun8i-emac.c
  2. 766,767d765
  3. <
  4. < /* nothing else to do */
  5. 1905c1903
  6. < return -EPROBE_DEFER;
  7. ---
  8. > goto probe_err;
  9. 1915,1916c1913,1916
  10. < if (PTR_ERR(priv->regulator) == -EPROBE_DEFER)
  11. < return -EPROBE_DEFER;
  12. ---
  13. > if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) {
  14. > ret = -EPROBE_DEFER;
  15. > goto probe_err;
  16. > }
  17. 1918a1919,1920
  18. > } else {
  19. > dev_info(&pdev->dev, "PHY regulator found\n");
  20. 1924,1925c1926,1929
  21. < if (PTR_ERR(priv->regulator_io) == -EPROBE_DEFER)
  22. < return -EPROBE_DEFER;
  23. ---
  24. > if (PTR_ERR(priv->regulator_io) == -EPROBE_DEFER) {
  25. > ret = -EPROBE_DEFER;
  26. > goto probe_err;
  27. > }
  28. 1927a1932,1933
  29. > } else {
  30. > dev_info(&pdev->dev, "PHY IO regulator found\n");
Add Comment
Please, Sign In to add comment