Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / net / tipc / ref.h

diff --git a/net/tipc/ref.h b/net/tipc/ref.h
index 4f8f9f40dcacdcdd0645373a4e157fbf8b76cec9..6d20006be45b66d4f034aabf6ebd1eb538041ecc 100644 (file)
--- 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