summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2014-04-11 03:46:13 +0200
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-04-25 02:26:28 +0200
commit81ad807b2601e51a6b9c0a7e4e2b25fad868ae0b (patch)
tree66183bc85033035ff41a212908fa3458ee669060
parentigb: Cleanups to change comment style on license headers (diff)
downloadlinux-81ad807b2601e51a6b9c0a7e4e2b25fad868ae0b.tar.xz
linux-81ad807b2601e51a6b9c0a7e4e2b25fad868ae0b.zip
igb: Cleanups to fix assignment in if error
This patch fixes ERROR:ASSIGN_IN_IF found with checkpatch file check. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 299ac1415146..6469f9715e1b 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4056,7 +4056,8 @@ static void igb_check_wvbr(struct igb_adapter *adapter)
switch (hw->mac.type) {
case e1000_82576:
case e1000_i350:
- if (!(wvbr = rd32(E1000_WVBR)))
+ wvbr = rd32(E1000_WVBR);
+ if (!wvbr)
return;
break;
default: