diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-14 15:17:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-14 15:17:54 -0400 |
| commit | 7f83560df2b51d41fbc77c7b204b3f5c2ad6765a (patch) | |
| tree | b42dbeaa952ad4846c6f232fc1a8992be8664f5a /drivers/net/ethernet/intel/e1000e/manage.c | |
| parent | 87b6d218f3adb00e6b58c7f96f8b5a74ff91abb4 (diff) | |
| parent | 8f56e4b9ab72109c5bf6d3e32ff43321a3ba4386 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/manage.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c index 473f8e711510..bacc950fc684 100644 --- a/drivers/net/ethernet/intel/e1000e/manage.c +++ b/drivers/net/ethernet/intel/e1000e/manage.c | |||
| @@ -85,7 +85,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw) | |||
| 85 | 85 | ||
| 86 | /* Check that the host interface is enabled. */ | 86 | /* Check that the host interface is enabled. */ |
| 87 | hicr = er32(HICR); | 87 | hicr = er32(HICR); |
| 88 | if ((hicr & E1000_HICR_EN) == 0) { | 88 | if (!(hicr & E1000_HICR_EN)) { |
| 89 | e_dbg("E1000_HOST_EN bit disabled.\n"); | 89 | e_dbg("E1000_HOST_EN bit disabled.\n"); |
| 90 | return -E1000_ERR_HOST_INTERFACE_COMMAND; | 90 | return -E1000_ERR_HOST_INTERFACE_COMMAND; |
| 91 | } | 91 | } |