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

Commit f9b308f7 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman
Browse files

qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom 



[ Upstream commit 9ddbc2a00d7f63fa9748f4278643193dac985f2d ]

Previous commit 68233c58 removes the qlcnic_rom_lock()
in qlcnic_pinit_from_rom(), but remains its corresponding
unlock function, which is odd. I'm not very sure whether the
lock is missing, or the unlock is redundant. This bug is
suggested by a static analysis tool, please advise.

Fixes: 68233c58 ("qlcnic: updated reset sequence")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 93f54354

drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c

+0 −1
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter) 
	QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c, 1);

	msleep(20);



	qlcnic_rom_unlock(adapter);

	/* big hammer don't reset CAM block on reset */

	QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0xfeffffff);