projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3f5ec1
)
sfc: Expose FPGA bitfile partition through MTD
author
Ben Hutchings
<bhutchings@solarflare.com>
Mon, 4 Jul 2011 23:05:56 +0000
(
00:05
+0100)
committer
Ben Hutchings
<bhutchings@solarflare.com>
Wed, 19 Sep 2012 01:56:24 +0000
(
02:56
+0100)
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
drivers/net/ethernet/sfc/mtd.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/sfc/mtd.c
b/drivers/net/ethernet/sfc/mtd.c
index
8f4604d
..
08f825b
100644
(file)
--- a/
drivers/net/ethernet/sfc/mtd.c
+++ b/
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];