summaryrefslogtreecommitdiff
path: root/net/tipc/ref.h
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2006-03-22 15:31:14 +1100
committerNathan Scott <nathans@bruce>2006-03-22 15:31:14 +1100
commit4d74f423c722b8cadfabe087369200013b217b67 (patch)
treed62facddfdb0dfd89f3e61f4fc699cf2feb4b082 /net/tipc/ref.h
parentbb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (diff)
parente952f31bce6e9f64db01f607abc46529ba57ac9e (diff)
Merge HEAD from ../linux-2.6
Diffstat (limited to 'net/tipc/ref.h')
-rw-r--r--net/tipc/ref.h4
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)
return r->object;
spin_unlock_bh(&r->lock);
}
- return 0;
+ return NULL;
}
/**
@@ -125,7 +125,7 @@ static inline void *tipc_ref_deref(u32 ref)
if (likely(r->data.reference == ref))
return r->object;
}
- return 0;
+ return NULL;
}
#endif