diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bridge/br_if.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index bff0f5bb12be..c2397f503b0f 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -273,17 +273,13 @@ int br_add_bridge(const char *name) | |||
273 | rtnl_lock(); | 273 | rtnl_lock(); |
274 | if (strchr(dev->name, '%')) { | 274 | if (strchr(dev->name, '%')) { |
275 | ret = dev_alloc_name(dev, dev->name); | 275 | ret = dev_alloc_name(dev, dev->name); |
276 | if (ret < 0) { | 276 | if (ret < 0) |
277 | free_netdev(dev); | 277 | goto out_free; |
278 | goto out; | ||
279 | } | ||
280 | } | 278 | } |
281 | 279 | ||
282 | ret = register_netdevice(dev); | 280 | ret = register_netdevice(dev); |
283 | if (ret) { | 281 | if (ret) |
284 | free_netdev(dev); | 282 | goto out_free; |
285 | goto out; | ||
286 | } | ||
287 | 283 | ||
288 | ret = br_sysfs_addbr(dev); | 284 | ret = br_sysfs_addbr(dev); |
289 | if (ret) | 285 | if (ret) |
@@ -291,6 +287,10 @@ int br_add_bridge(const char *name) | |||
291 | out: | 287 | out: |
292 | rtnl_unlock(); | 288 | rtnl_unlock(); |
293 | return ret; | 289 | return ret; |
290 | |||
291 | out_free: | ||
292 | free_netdev(dev); | ||
293 | goto out; | ||
294 | } | 294 | } |
295 | 295 | ||
296 | int br_del_bridge(const char *name) | 296 | int br_del_bridge(const char *name) |