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

Commit 7f1a2491 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() 



[ Upstream commit bbc404d20d1b46d89b461918bc44587620eda200 ]

All error handling paths, except this one, go to 'out' where
release_swfw_sync() is called.
This call balances the acquire_swfw_sync() call done at the beginning of
the function.

Branch to the error handling path in order to correctly release some
resources in case of error.

Fixes: ae14a1d8 ("ixgbe: Fix IOSF SB access issues")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a10e95d6

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

+2 −1
Original line number Diff line number Diff line
@@ -717,7 +717,8 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, 
		error = (command & IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK) >>

			 IXGBE_SB_IOSF_CTRL_CMPL_ERR_SHIFT;

		hw_dbg(hw, "Failed to read, error %x\n", error);

		return -EIO;

		ret = -EIO;

		goto out;

	}



	if (!ret)