diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /net/tipc/ref.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/tipc/ref.c')
| -rw-r--r-- | net/tipc/ref.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/ref.c b/net/tipc/ref.c index 6704a58c7851..c38744c96ed1 100644 --- a/net/tipc/ref.c +++ b/net/tipc/ref.c | |||
| @@ -148,7 +148,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock) | |||
| 148 | reference = (next_plus_upper & ~index_mask) + index; | 148 | reference = (next_plus_upper & ~index_mask) + index; |
| 149 | entry->data.reference = reference; | 149 | entry->data.reference = reference; |
| 150 | entry->object = object; | 150 | entry->object = object; |
| 151 | if (lock != 0) | 151 | if (lock != NULL) |
| 152 | *lock = &entry->lock; | 152 | *lock = &entry->lock; |
| 153 | spin_unlock_bh(&entry->lock); | 153 | spin_unlock_bh(&entry->lock); |
| 154 | } | 154 | } |