diff --git a/[refs] b/[refs] index b78a566b1185..28a76d532e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ae289444b968b4cefd776ada8da519ce10e56fa +refs/heads/master: 9d6dda32c7570bbf189cf74fbc36338d0a94e999 diff --git a/trunk/drivers/net/loopback.c b/trunk/drivers/net/loopback.c index be25aa33971c..662b8d16803c 100644 --- a/trunk/drivers/net/loopback.c +++ b/trunk/drivers/net/loopback.c @@ -265,17 +265,16 @@ static __net_init int loopback_net_init(struct net *net) if (err) goto out_free_netdev; - err = 0; net->loopback_dev = dev; + return 0; -out: - if (err) - panic("loopback: Failed to register netdevice: %d\n", err); - return err; out_free_netdev: free_netdev(dev); - goto out; +out: + if (net == &init_net) + panic("loopback: Failed to register netdevice: %d\n", err); + return err; } static __net_exit void loopback_net_exit(struct net *net)