From 189ced6d97a93c5814ddb4c01fdbadcd353a0cd1 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 30 Jul 2007 16:29:40 -0700 Subject: [PATCH] --- yaml --- r: 63402 b: refs/heads/master c: 7ce1b0edcb11f90f6fc5e0ceecff467f329889a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52e7b368ebe2..56d8a7ab10b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccc7911fbd1c5af9b60453d3a8cca0a36402fee5 +refs/heads/master: 7ce1b0edcb11f90f6fc5e0ceecff467f329889a0 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 8c9518e946fa..7bfea5e9030e 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3337,7 +3337,7 @@ int register_netdevice(struct net_device *dev) if (!dev_valid_name(dev->name)) { ret = -EINVAL; - goto out; + goto err_uninit; } dev->ifindex = dev_new_index(); @@ -3351,7 +3351,7 @@ int register_netdevice(struct net_device *dev) = hlist_entry(p, struct net_device, name_hlist); if (!strncmp(d->name, dev->name, IFNAMSIZ)) { ret = -EEXIST; - goto out; + goto err_uninit; } } @@ -3411,7 +3411,7 @@ int register_netdevice(struct net_device *dev) ret = netdev_register_sysfs(dev); if (ret) - goto out; + goto err_uninit; dev->reg_state = NETREG_REGISTERED; /* @@ -3436,6 +3436,11 @@ int register_netdevice(struct net_device *dev) out: return ret; + +err_uninit: + if (dev->uninit) + dev->uninit(dev); + goto out; } /**