diff options
| author | Murali Karicheri <m-karicheri2@ti.com> | 2018-04-17 17:30:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-18 21:00:57 -0400 |
| commit | c52b6782d00e4de299647dc6448aa844a9f4941b (patch) | |
| tree | 885f8951624adb361f1470f284514565f0751967 /drivers/net/ethernet/ti | |
| parent | 7b647b93b359d590094e0787fc86a6a9d57b25f7 (diff) | |
| download | blackbird-op-linux-c52b6782d00e4de299647dc6448aa844a9f4941b.tar.gz blackbird-op-linux-c52b6782d00e4de299647dc6448aa844a9f4941b.zip | |
Revert "net: netcp: remove dead code from the driver"
As the probe sequence is not guaranteed contrary to the assumption
of the commit 2d8e276a9030, same has to be reverted.
commit 2d8e276a9030 ("net: netcp: remove dead code from the driver")
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index f5a7eb22d0f5..9c51b25d7fd0 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -2155,6 +2155,7 @@ static int netcp_probe(struct platform_device *pdev) struct device_node *child, *interfaces; struct netcp_device *netcp_device; struct device *dev = &pdev->dev; + struct netcp_module *module; int ret; if (!node) { @@ -2203,6 +2204,14 @@ static int netcp_probe(struct platform_device *pdev) /* Add the device instance to the list */ list_add_tail(&netcp_device->device_list, &netcp_devices); + /* Probe & attach any modules already registered */ + mutex_lock(&netcp_modules_lock); + for_each_netcp_module(module) { + ret = netcp_module_probe(netcp_device, module); + if (ret < 0) + dev_err(dev, "module(%s) probe failed\n", module->name); + } + mutex_unlock(&netcp_modules_lock); return 0; probe_quit_interface: |
