Commit 1dbc84a7 authored Aug 23, 2009 by Dhananjay Phadke Committed by David S. Miller Aug 23, 2009

netxen: fix firmware reset logic



If netxen_need_fw_reset() return 0 [ implies firmware is up
and running], still go through dma mask check, etc.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1bb482f8

drivers/net/netxen/netxen_nic_main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -754,8 +754,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
		netxen_request_firmware(adapter);

		err = netxen_need_fw_reset(adapter);
		if (err <= 0)
		if (err < 0)
		return err;
		if (err == 0)
		goto wait_init;

		if (first_boot != 0x55555555) {
		NXWR32(adapter, CRB_CMDPEG_STATE, 0);