From 411ee5fe4f123f106bd3a6e03e51a3cf66b75629 Mon Sep 17 00:00:00 2001
From: Sritej Velaga <sritej.velaga@qlogic.com>
Date: Fri, 3 Feb 2012 11:35:12 +0000
Subject: [PATCH] --- yaml --- r: 289862 b: refs/heads/master c:
 db608c129b5258dbdff9c221857a95bc2dc1128e h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c8d22ab1b505..f110dffcf607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83f18a557c6d6cdc03c7821e0b596c8f8b7bdb9f
+refs/heads/master: db608c129b5258dbdff9c221857a95bc2dc1128e
diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
index 8f89c05e0c70..f3c0057a802b 100644
--- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
+++ b/trunk/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