aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-09-11 07:28:13 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-11 19:58:45 -0400
commitec5c50cb93c446a4686863df74e4b7a547628115 (patch)
tree276e2c1d4c0e806c429322e75f10f985da441ee4 /drivers
parentea6828b8aa3a8ebae8d7740f32f212ba1d2f0742 (diff)
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')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c5
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)
817 if (err < 0) 817 if (err < 0)
818 goto err_out; 818 goto err_out;
819 if (err == 0) 819 if (err == 0)
820 goto wait_init; 820 goto ready;
821 821
822 if (first_boot != 0x55555555) { 822 if (first_boot != 0x55555555) {
823 NXWR32(adapter, CRB_CMDPEG_STATE, 0); 823 NXWR32(adapter, CRB_CMDPEG_STATE, 0);
@@ -860,6 +860,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
860 | (_NETXEN_NIC_LINUX_SUBVERSION); 860 | (_NETXEN_NIC_LINUX_SUBVERSION);
861 NXWR32(adapter, CRB_DRIVER_VERSION, val); 861 NXWR32(adapter, CRB_DRIVER_VERSION, val);
862 862
863ready:
863 NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_READY); 864 NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_READY);
864 865
865wait_init: 866wait_init:
@@ -874,7 +875,7 @@ wait_init:
874 875
875 netxen_check_options(adapter); 876 netxen_check_options(adapter);
876 877
877 return 0; 878 /* fall through and release firmware */
878 879
879err_out: 880err_out:
880 netxen_release_firmware(adapter); 881 netxen_release_firmware(adapter);