From 0a417a0a2cb5227b4580004e778e3bf1305e3145 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 5 Jul 2011 00:05:56 +0100
Subject: [PATCH] --- yaml --- r: 328015 b: refs/heads/master c:
 e5621545e2461730af23054f355d348109881eb9 h: refs/heads/master i:   328013:
 7e7d5b067fc882a9a5f324f95f729737573a3979   328011:
 d2c4ba6e9574edb6a89a290de824f0b62fe36420   328007:
 380a1929e844d0438ff3391ad1e4ccae193ecdfb   327999:
 519c6eb4fe2d28cda8d4b182597e44abe5f8df5d v: v3

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

diff --git a/[refs] b/[refs]
index 90562068537e..7b9ed91ab8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f5ec1108ee01b555d5894722884e40dbec058f
+refs/heads/master: e5621545e2461730af23054f355d348109881eb9
diff --git a/trunk/drivers/net/ethernet/sfc/mtd.c b/trunk/drivers/net/ethernet/sfc/mtd.c
index 8f4604d5d642..08f825b71ac8 100644
--- a/trunk/drivers/net/ethernet/sfc/mtd.c
+++ b/trunk/drivers/net/ethernet/sfc/mtd.c
@@ -585,6 +585,7 @@ static const struct siena_nvram_type_info siena_nvram_types[] = {
 	[MC_CMD_NVRAM_TYPE_EXP_ROM_CFG_PORT1]	= { 1, "sfc_exp_rom_cfg" },
 	[MC_CMD_NVRAM_TYPE_PHY_PORT0]		= { 0, "sfc_phy_fw" },
 	[MC_CMD_NVRAM_TYPE_PHY_PORT1]		= { 1, "sfc_phy_fw" },
+	[MC_CMD_NVRAM_TYPE_FPGA]		= { 0, "sfc_fpga" },
 };
 
 static int siena_mtd_probe_partition(struct efx_nic *efx,
@@ -598,7 +599,8 @@ static int siena_mtd_probe_partition(struct efx_nic *efx,
 	bool protected;
 	int rc;
 
-	if (type >= ARRAY_SIZE(siena_nvram_types))
+	if (type >= ARRAY_SIZE(siena_nvram_types) ||
+	    siena_nvram_types[type].name == NULL)
 		return -ENODEV;
 
 	info = &siena_nvram_types[type];