---

yaml --- r: 289862 b: refs/heads/master c: db608c1 h: refs/heads/master v: v3
git-mirror · Feb 4, 2012 · 411ee5f · 411ee5f
1 parent 1a25fe9
commit 411ee5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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