Skip to content

Commit

Permalink
sfc: Warn if unable to create MTDs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Hutchings committed Feb 13, 2012
1 parent 5b6262d commit 7c43161
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion drivers/net/ethernet/sfc/efx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/sfc/mtd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 7c43161

Please sign in to comment.