diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/tipc/ref.h | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'net/tipc/ref.h')
-rw-r--r-- | net/tipc/ref.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/ref.h b/net/tipc/ref.h index 4f8f9f40dcac..6d20006be45b 100644 --- a/net/tipc/ref.h +++ b/net/tipc/ref.h | |||
@@ -92,7 +92,7 @@ static inline void *tipc_ref_lock(u32 ref) | |||
92 | return r->object; | 92 | return r->object; |
93 | spin_unlock_bh(&r->lock); | 93 | spin_unlock_bh(&r->lock); |
94 | } | 94 | } |
95 | return 0; | 95 | return NULL; |
96 | } | 96 | } |
97 | 97 | ||
98 | /** | 98 | /** |
@@ -125,7 +125,7 @@ static inline void *tipc_ref_deref(u32 ref) | |||
125 | if (likely(r->data.reference == ref)) | 125 | if (likely(r->data.reference == ref)) |
126 | return r->object; | 126 | return r->object; |
127 | } | 127 | } |
128 | return 0; | 128 | return NULL; |
129 | } | 129 | } |
130 | 130 | ||
131 | #endif | 131 | #endif |