diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-09-11 11:28:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 16:58:45 -0700 |
| commit | ec5c50cb93c446a4686863df74e4b7a547628115 (patch) | |
| tree | 276e2c1d4c0e806c429322e75f10f985da441ee4 /drivers/net | |
| parent | ea6828b8aa3a8ebae8d7740f32f212ba1d2f0742 (diff) | |
| download | blackbird-op-linux-ec5c50cb93c446a4686863df74e4b7a547628115.tar.gz blackbird-op-linux-ec5c50cb93c446a4686863df74e4b7a547628115.zip | |
netxen: fix file firmware leak
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 557e76c4c589..e8574eeae58f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -817,7 +817,7 @@ netxen_start_firmware(struct netxen_adapter *adapter) if (err < 0) goto err_out; if (err == 0) - goto wait_init; + goto ready; if (first_boot != 0x55555555) { NXWR32(adapter, CRB_CMDPEG_STATE, 0); @@ -860,6 +860,7 @@ netxen_start_firmware(struct netxen_adapter *adapter) | (_NETXEN_NIC_LINUX_SUBVERSION); NXWR32(adapter, CRB_DRIVER_VERSION, val); +ready: NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_READY); wait_init: @@ -874,7 +875,7 @@ wait_init: netxen_check_options(adapter); - return 0; + /* fall through and release firmware */ err_out: netxen_release_firmware(adapter); |
