diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-22 13:51:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-22 13:51:15 +1000 |
| commit | 0233ede0c418880b6e036e7bd7f7f291123cb453 (patch) | |
| tree | 2e4692b01363de14d5296efd283cf00349be8a4a | |
| parent | 146203d85df4f6f1043c9a5a8144e8773778aa5f (diff) | |
| parent | 5f16d3921f201088ebdc0ca54ee3e52a5927353e (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/w1/w1_int.c | 3 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 47249a30eae3..20f766afa4c7 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -91,8 +91,7 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, err = device_register(&dev->dev); if (err) { pr_err("Failed to register master device. err=%d\n", err); - memset(dev, 0, sizeof(struct w1_master)); - kfree(dev); + put_device(&dev->dev); dev = NULL; } diff --git a/net/ipv4/route.c b/net/ipv4/route.c index c9fd04546edf..a30b9f369ee4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1692,6 +1692,8 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, struct net *net = dev_net(dev); bool do_cache; + res.table = 0; + /* IP on this device is disabled. */ if (!in_dev) |