ixgbevf: Check for adapter removal on register writes

[sfrench/cifs-2.6.git] / drivers / net / ethernet / intel / ixgbevf / vf.h

diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 7cb1a520e5612056b8a5739f90e5452d54153db9..096d33a59def24fce47028314dd406c8ba97436f 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
@@ -178,7 +178,11 @@ struct ixgbevf_info {
 
 static inline void ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 value)
 {
-       writel(value, hw->hw_addr + reg);
+       u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
+
+       if (IXGBE_REMOVED(reg_addr))
+               return;
+       writel(value, reg_addr + reg);
 }
 #define IXGBE_WRITE_REG(h, r, v) ixgbe_write_reg(h, r, v)