summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/amd
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2017-06-28 20:42:16 +0200
committerDavid S. Miller <davem@davemloft.net>2017-06-29 21:14:17 +0200
commit42d452dc4a3674bbe53fa80f00f31f72385252dd (patch)
treedfe439db768303505685817ddd995eae8bb8ea52 /drivers/net/ethernet/amd
parentamd-xgbe: Prevent looping forever if timestamp update fails (diff)
downloadlinux-42d452dc4a3674bbe53fa80f00f31f72385252dd.tar.xz
linux-42d452dc4a3674bbe53fa80f00f31f72385252dd.zip
amd-xgbe: Handle return code from software reset function
Currently the function that performs a software reset of the hardware provides a return code. During driver probe check this return code and exit with an error if the software reset fails. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
-rw-r--r--drivers/net/ethernet/amd/xgbe/xgbe-main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index 17ac8f9a51a0..982368b560ba 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -277,7 +277,11 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata)
pdata->desc_ded_period = jiffies;
/* Issue software reset to device */
- pdata->hw_if.exit(pdata);
+ ret = pdata->hw_if.exit(pdata);
+ if (ret) {
+ dev_err(dev, "software reset failed\n");
+ return ret;
+ }
/* Set default configuration data */
xgbe_default_config(pdata);