diff options
author | David S. Miller <davem@davemloft.net> | 2010-09-09 14:58:11 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-09 14:58:11 -0700 |
commit | cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95 (patch) | |
tree | d5feaeef197dc681d1cdab2e8070ac31f0c43141 /net/rds/iw_sysctl.c | |
parent | atlx: make strings const (diff) | |
parent | RDS: Remove dead struct from rds.h (diff) | |
download | linux-dev-cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95.tar.xz linux-dev-cf0ac2b8a759fecbefd80f890c6dbe80ba65fd95.zip |
Merge branch 'for-davem' of git://oss.oracle.com/git/agrover/linux-2.6
Diffstat (limited to 'net/rds/iw_sysctl.c')
-rw-r--r-- | net/rds/iw_sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/iw_sysctl.c b/net/rds/iw_sysctl.c index 1c4428a61a02..23e3a9a26aaf 100644 --- a/net/rds/iw_sysctl.c +++ b/net/rds/iw_sysctl.c @@ -122,10 +122,10 @@ void rds_iw_sysctl_exit(void) unregister_sysctl_table(rds_iw_sysctl_hdr); } -int __init rds_iw_sysctl_init(void) +int rds_iw_sysctl_init(void) { rds_iw_sysctl_hdr = register_sysctl_paths(rds_iw_sysctl_path, rds_iw_sysctl_table); - if (rds_iw_sysctl_hdr == NULL) + if (!rds_iw_sysctl_hdr) return -ENOMEM; return 0; } |