Commit 6c1d8b96 authored May 02, 2013 by Akeem G. Abodunrin Committed by Jeff Kirsher May 21, 2013

e1000e: Release mutex lock only if it has been initially acquired

This patch fixes the issue of unlocking swflag_mutex for 82574 and 82583
devices regardless of if the hw semaphore has been successfully acquired via
e1000_get_hw_semaphore_82574(). With this patch, unlocking mutex now depends
on if the hw semaphore was successfully acquired before. And 82574/82583
devices are reset regardless of whether e1000_get_hw_semaphore_82574()
returns success or failure.

Reported-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 603cdca9

drivers/net/ethernet/intel/e1000e/82571.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1003,8 +1003,6 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
		default:
		break;
		}
		if (ret_val)
		e_dbg("Cannot acquire MDIO ownership\n");

		ctrl = er32(CTRL);

		@@ -1015,6 +1013,8 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
		switch (hw->mac.type) {
		case e1000_82574:
		case e1000_82583:
		/* Release mutex only if the hw semaphore is acquired */
		if (!ret_val)
		e1000_put_hw_semaphore_82574(hw);
		break;
		default: