From 10c0f4dc14f1705a61a915c4985e3d514a460f95 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 3 Sep 2008 15:07:50 +0100
Subject: [PATCH] --- yaml --- r: 111822 b: refs/heads/master c:
 88c59425139c0cd9984ca8f1ef577959326446d3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/sfc/falcon.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f9e5816cfb3..2a09472f4a78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da8de3929da9396977b3c9096f36b173f3d9085a
+refs/heads/master: 88c59425139c0cd9984ca8f1ef577959326446d3
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index e0c0b23f94ef..636fe824b863 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -2758,6 +2758,8 @@ int falcon_probe_nic(struct efx_nic *efx)
 
 	/* Allocate storage for hardware specific data */
 	nic_data = kzalloc(sizeof(*nic_data), GFP_KERNEL);
+	if (!nic_data)
+		return -ENOMEM;
 	efx->nic_data = nic_data;
 
 	/* Determine number of ports etc. */