summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-06-27 09:08:09 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-06-27 09:08:09 -0700
commit592600a0536f0d5aab4dc95f19515a37d03430f8 (patch)
tree94b166da5afa2f5494e5154e6ef7109990d2c112 /drivers
parentee04022a21764a12e29eee144b72344ebfe0a55c (diff)
downloadop-kernel-dev-592600a0536f0d5aab4dc95f19515a37d03430f8.zip
op-kernel-dev-592600a0536f0d5aab4dc95f19515a37d03430f8.tar.gz
e1000: check return value of _get_speed_and_duplex
We were not checking the return value of get_speed_and_duplex properly, whih may contain an error value. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_hw.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 37eb351..784f950 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -2737,8 +2737,12 @@ e1000_check_for_link(struct e1000_hw *hw)
*/
if(hw->tbi_compatibility_en) {
uint16_t speed, duplex;
- e1000_get_speed_and_duplex(hw, &speed, &duplex);
- if(speed != SPEED_1000) {
+ ret_val = e1000_get_speed_and_duplex(hw, &speed, &duplex);
+ if (ret_val) {
+ DEBUGOUT("Error getting link speed and duplex\n");
+ return ret_val;
+ }
+ if (speed != SPEED_1000) {
/* If link speed is not set to gigabit speed, we do not need
* to enable TBI compatibility.
*/
OpenPOWER on IntegriCloud