diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index e43cbbd5bec1..69205ace16eb 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -1778,22 +1778,16 @@ netxen_setup_hwops(struct netxen_adapter *adapter) | |||
| 1778 | 1778 | ||
| 1779 | int netxen_nic_get_board_info(struct netxen_adapter *adapter) | 1779 | int netxen_nic_get_board_info(struct netxen_adapter *adapter) |
| 1780 | { | 1780 | { |
| 1781 | int offset, board_type, magic, header_version; | 1781 | int offset, board_type, magic; |
| 1782 | struct pci_dev *pdev = adapter->pdev; | 1782 | struct pci_dev *pdev = adapter->pdev; |
| 1783 | 1783 | ||
| 1784 | offset = NX_FW_MAGIC_OFFSET; | 1784 | offset = NX_FW_MAGIC_OFFSET; |
| 1785 | if (netxen_rom_fast_read(adapter, offset, &magic)) | 1785 | if (netxen_rom_fast_read(adapter, offset, &magic)) |
| 1786 | return -EIO; | 1786 | return -EIO; |
| 1787 | 1787 | ||
| 1788 | offset = NX_HDR_VERSION_OFFSET; | 1788 | if (magic != NETXEN_BDINFO_MAGIC) { |
| 1789 | if (netxen_rom_fast_read(adapter, offset, &header_version)) | 1789 | dev_err(&pdev->dev, "invalid board config, magic=%08x\n", |
| 1790 | return -EIO; | 1790 | magic); |
| 1791 | |||
| 1792 | if (magic != NETXEN_BDINFO_MAGIC || | ||
| 1793 | header_version != NETXEN_BDINFO_VERSION) { | ||
| 1794 | dev_err(&pdev->dev, | ||
| 1795 | "invalid board config, magic=%08x, version=%08x\n", | ||
| 1796 | magic, header_version); | ||
| 1797 | return -EIO; | 1791 | return -EIO; |
| 1798 | } | 1792 | } |
| 1799 | 1793 | ||
