sfc: Move MTD probe after netdev registration and name allocation
The MTD partition is named based on the netdev name, which is set to 'eth%d' before registration. Also, the MTD partition will currently be left registered if netdev registration fails. Fix both these problems by moving the MTD probe after netdev registration. Hold the RTNL to serialise this with the netdev notifier that calls efx_mtd_rename(). Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2ed380a59b
commit
a5211bb5f7
|
@ -2209,13 +2209,15 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
|
|||
* MAC stats succeeds. */
|
||||
efx->state = STATE_RUNNING;
|
||||
|
||||
efx_mtd_probe(efx); /* allowed to fail */
|
||||
|
||||
rc = efx_register_netdev(efx);
|
||||
if (rc)
|
||||
goto fail5;
|
||||
|
||||
EFX_LOG(efx, "initialisation successful\n");
|
||||
|
||||
rtnl_lock();
|
||||
efx_mtd_probe(efx); /* allowed to fail */
|
||||
rtnl_unlock();
|
||||
return 0;
|
||||
|
||||
fail5:
|
||||
|
|
Loading…
Reference in New Issue