aboutsummaryrefslogtreecommitdiff
path: root/net/decnet/sysctl_net_decnet.c
diff options
context:
space:
mode:
authorPaul Mundt <[email protected]>2009-11-18 10:53:52 +0900
committerPaul Mundt <[email protected]>2009-11-18 10:53:52 +0900
commit260af56271f79da0e37faa5a99b1786b221297e5 (patch)
treed76a2609f940b88083314d5f9131c73115bd4dcb /net/decnet/sysctl_net_decnet.c
parent1dca899e95d27475c9036ce1cf857a72852b9c53 (diff)
parent648f15345add88a7eea724365fe1217a8d8a1e16 (diff)
Merge branch 'sh/stable-updates'
Diffstat (limited to 'net/decnet/sysctl_net_decnet.c')
-rw-r--r--net/decnet/sysctl_net_decnet.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 26b0ab1e9f56..2036568beea9 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -263,11 +263,10 @@ static int dn_def_dev_strategy(ctl_table *table,
return -ENODEV;
rv = -ENODEV;
- if (dev->dn_ptr != NULL) {
+ if (dev->dn_ptr != NULL)
rv = dn_dev_set_default(dev, 1);
- if (rv)
- dev_put(dev);
- }
+ if (rv)
+ dev_put(dev);
}
return rv;