diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /net/unix/af_unix.c | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
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) | |||
| 2213 | #endif | 2213 | #endif |
| 2214 | error = 0; | 2214 | error = 0; |
| 2215 | out: | 2215 | out: |
| 2216 | return 0; | 2216 | return error; |
| 2217 | } | 2217 | } |
| 2218 | 2218 | ||
| 2219 | static void unix_net_exit(struct net *net) | 2219 | static void unix_net_exit(struct net *net) |