From 08c9d640558bbc0eb076ccd4d5a0caacd1d90989 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 27 Jan 2012 17:23:58 +0000
Subject: [PATCH] --- yaml --- r: 290165 b: refs/heads/master c:
 7c43161c11d7f40e38db9a1adb61347f06127796 h: refs/heads/master i:   290163:
 df69848eefef2a82882c2ea37a77107269426e97 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ethernet/sfc/efx.c | 7 ++++++-
 trunk/drivers/net/ethernet/sfc/mtd.c | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d99a4e6615cb..081daf6977d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6262d0ccf759a16fabe11d904a2531125a4b71
+refs/heads/master: 7c43161c11d7f40e38db9a1adb61347f06127796
diff --git a/trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/ethernet/sfc/efx.c
index 2e6389c55cee..ce07aa516cd2 100644
--- a/trunk/drivers/net/ethernet/sfc/efx.c
+++ b/trunk/drivers/net/ethernet/sfc/efx.c
@@ -2502,9 +2502,14 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
 
 	netif_dbg(efx, probe, efx->net_dev, "initialisation successful\n");
 
+	/* Try to create MTDs, but allow this to fail */
 	rtnl_lock();
-	efx_mtd_probe(efx); /* allowed to fail */
+	rc = efx_mtd_probe(efx);
 	rtnl_unlock();
+	if (rc)
+		netif_warn(efx, probe, efx->net_dev,
+			   "failed to create MTDs (%d)\n", rc);
+
 	return 0;
 
  fail4:
diff --git a/trunk/drivers/net/ethernet/sfc/mtd.c b/trunk/drivers/net/ethernet/sfc/mtd.c
index 79c192272047..26b3c23b0b6f 100644
--- a/trunk/drivers/net/ethernet/sfc/mtd.c
+++ b/trunk/drivers/net/ethernet/sfc/mtd.c
@@ -280,7 +280,7 @@ static int efx_mtd_probe_device(struct efx_nic *efx, struct efx_mtd *efx_mtd)
 		--part;
 		efx_mtd_remove_partition(part);
 	}
-	/* mtd_device_register() returns 1 if the MTD table is full */
+	/* Failure is unlikely here, but probably means we're out of memory */
 	return -ENOMEM;
 }