e1000e: test for valid check_reset_block function pointer
authorBruce Allan <bruce.w.allan@intel.com>
Sat, 26 May 2012 06:08:48 +0000 (06:08 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 6 Jun 2012 03:47:50 +0000 (20:47 -0700)
commit470a54207ccf7045a59df727573bd9d148988582
tree3185cac29aa5f6699f0b4cc5a9f71395efb337a4
parentdc5cd894cace7bda4a743487a9f87d59a3f0a095
e1000e: test for valid check_reset_block function pointer

commit 44abd5c12767a8c567dc4e45fd9aec3b13ca85e0 introduced NULL pointer
dereferences when attempting to access the check_reset_block function
pointer on 8257x and 80003es2lan non-copper devices.

This fix should be applied back through 3.4.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/mac.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/e1000e/phy.c