From: Sritej Velaga <sritej.velaga@qlogic.com>
Date: Fri, 3 Feb 2012 11:35:12 +0000 (+0000)
Subject: netxen_nic: Fix phy link status
X-Git-Tag: v3.12-rc1~3664^2~414
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db608c129b5258dbdff9c221857a95bc2dc1128e;p=kernel%2Fkernel-generic.git

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>
---

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 8f89c05..f3c0057 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