diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-21 14:25:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-21 14:25:18 +1000 |
| commit | a4a1dc008fef2eed227cf077d8337117b2d7b3e1 (patch) | |
| tree | a089185221f7e3eb5164be4ab90e80154df2168e | |
| parent | e013e4becb46c79cad31249a9d90f2eb652e6b8f (diff) | |
| parent | a09be1864d25c3edc436b5e7cdb66d91b8d14736 (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 80f7c5b7b832..e630d053c6b8 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) |