aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic
diff options
context:
space:
mode:
authorSritej Velaga <sritej.velaga@qlogic.com>2012-02-03 11:35:12 +0000
committerDavid S. Miller <davem@davemloft.net>2012-02-04 15:59:29 -0500
commitdb608c129b5258dbdff9c221857a95bc2dc1128e (patch)
tree2fe9b5554a68c971957625c87597780be4138a26 /drivers/net/ethernet/qlogic
parentnetxen_nic: fw dump support (diff)
downloadlinux-dev-db608c129b5258dbdff9c221857a95bc2dc1128e.tar.xz
linux-dev-db608c129b5258dbdff9c221857a95bc2dc1128e.zip
netxen_nic: Fix phy link status
Pass the adapter phy link status to the caller. Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 8f89c05e0c70..f3c0057a802b 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
@@ -559,7 +559,11 @@ nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val)
if (rcode != NX_RCODE_SUCCESS)
return -EIO;
- return cmd.rsp.arg1;
+ if (val == NULL)
+ return -EIO;
+
+ *val = cmd.rsp.arg1;
+ return 0;
}
int