summaryrefslogtreecommitdiffstats
path: root/net/decnet/sysctl_net_decnet.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-01 15:58:15 +0100
commitb00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch)
treedde815788aaea3e336aaaf24763311ce63a22e1b /net/decnet/sysctl_net_decnet.c
parent75639e7ee1401b3876c7a00ffe96ea8027668690 (diff)
parentd6797322231af98b9bb4afb175dd614cf511e5f7 (diff)
downloadkernel-crypto-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.gz
kernel-crypto-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.xz
kernel-crypto-b00615d163cd24fa98d155acfc1f9d81d6fe1103.zip
Merge branch 'topic/pcm-dma-fix' into topic/core-change
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 26b0ab1e9f5..2036568beea 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;