diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-27 17:23:58 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-13 23:40:50 +0000 |
| commit | 7c43161c11d7f40e38db9a1adb61347f06127796 (patch) | |
| tree | b56ad975f2ea903ee58048c13b78705aadaec822 /drivers/net/ethernet/sfc | |
| parent | 5b6262d0ccf759a16fabe11d904a2531125a4b71 (diff) | |
| download | linux-7c43161c11d7f40e38db9a1adb61347f06127796.tar.bz2 | |
sfc: Warn if unable to create MTDs
Log an explicit warning if we are unable to create MTDs for a net
device. Also correct the comment about why mtd_device_register() may
fail; there is no longer an MTD table to fill up.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 7 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/mtd.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 2e6389c55cee..ce07aa516cd2 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/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/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c index 79c192272047..26b3c23b0b6f 100644 --- a/drivers/net/ethernet/sfc/mtd.c +++ b/drivers/net/ethernet/sfc/mtd.c @@ -280,7 +280,7 @@ fail: --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; } |