lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: fix file firmware leak

Browse Source 
Release file firmware when no firmware reset is required.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dhananjay Phadke
2009-09-11 11:28:13 +00:00
committed by David S. Miller
parent ea6828b8aa
commit ec5c50cb93
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/netxen/netxen_nic_main.c
View File

@@ -817,7 +817,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
if (err < 0) if (err < 0)
goto err_out; goto err_out;
if (err == 0) if (err == 0)
goto wait_init; goto ready;
if (first_boot != 0x55555555) { if (first_boot != 0x55555555) {
NXWR32(adapter, CRB_CMDPEG_STATE, 0); NXWR32(adapter, CRB_CMDPEG_STATE, 0);
@@ -860,6 +860,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
| (_NETXEN_NIC_LINUX_SUBVERSION); | (_NETXEN_NIC_LINUX_SUBVERSION);
NXWR32(adapter, CRB_DRIVER_VERSION, val); NXWR32(adapter, CRB_DRIVER_VERSION, val);
ready:
NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_READY); NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_READY);
wait_init: wait_init:
@@ -874,7 +875,7 @@ wait_init:
netxen_check_options(adapter); netxen_check_options(adapter);
return 0; /* fall through and release firmware */
err_out: err_out:
netxen_release_firmware(adapter); netxen_release_firmware(adapter);