diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2018-03-30 09:28:51 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-31 22:22:10 -0400 |
| commit | ef817102586cca428d6fe0803cc232a3c929141f (patch) | |
| tree | 1d5332f50fa0b68efc2b950b4bd834eb4cf1b156 /drivers/net/netdevsim/netdev.c | |
| parent | Merge branch 'tipc-slim-down-name-table' (diff) | |
| download | linux-dev-ef817102586cca428d6fe0803cc232a3c929141f.tar.xz linux-dev-ef817102586cca428d6fe0803cc232a3c929141f.zip | |
netdevsim: Change nsim_devlink_setup to return error to caller
Change nsim_devlink_setup to return any error back to the caller and
update nsim_init to handle it.
Requested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim/netdev.c')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 8b30ab3ea2c2..ec68f38213d9 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -167,10 +167,14 @@ static int nsim_init(struct net_device *dev) SET_NETDEV_DEV(dev, &ns->dev); - nsim_devlink_setup(ns); + err = nsim_devlink_setup(ns); + if (err) + goto err_unreg_dev; return 0; +err_unreg_dev: + device_unregister(&ns->dev); err_bpf_uninit: nsim_bpf_uninit(ns); err_debugfs_destroy: |