diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
| commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
| tree | f59185b71c8059941de79143f71178453599b8f1 /net/unix/af_unix.c | |
| parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index dc504d308ec0..4d3c6071b9a4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2213,7 +2213,7 @@ static int unix_net_init(struct net *net) #endif error = 0; out: - return 0; + return error; } static void unix_net_exit(struct net *net) |