Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35fdb94b authored by Steven La's avatar Steven La Committed by David S. Miller
Browse files

e1000e: balance semaphore put/get for 82573 



Steven (cc-ed) noticed an imbalance in semaphore put/get for
82573-based NICs. Don't we need something like the following
(untested) patch?

Signed-off-by: default avatarSteven La <sla@riverbed.com>
Acked-by: default avatarArthur Kepner <akepner@riverbed.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7064f4c

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -1011,6 +1011,11 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 




	/* Must release MDIO ownership and mutex after MAC reset. */

	/* Must release MDIO ownership and mutex after MAC reset. */

	switch (hw->mac.type) {

	switch (hw->mac.type) {

	case e1000_82573:

		/* Release mutex only if the hw semaphore is acquired */

		if (!ret_val)

			e1000_put_hw_semaphore_82573(hw);

		break;

	case e1000_82574:

	case e1000_82574:

	case e1000_82583:

	case e1000_82583:

		/* Release mutex only if the hw semaphore is acquired */

		/* Release mutex only if the hw semaphore is acquired */