GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 06:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-01-03 11:40:42 -05:00
commit 5f0850e145
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/ethernet/freescale/fec_main.c
View file

@ -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 @@ failed_phy:
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;
} }