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/dbg.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/tipc/dbg.c')
| -rw-r--r-- | net/tipc/dbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c index 4f4beefa7830..26ef95d5fe38 100644 --- a/net/tipc/dbg.c +++ b/net/tipc/dbg.c | |||
| @@ -81,7 +81,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 sz) | |||
| 81 | 81 | ||
| 82 | pb->crs = pb->buf = raw; | 82 | pb->crs = pb->buf = raw; |
| 83 | pb->size = sz; | 83 | pb->size = sz; |
| 84 | pb->next = 0; | 84 | pb->next = NULL; |
| 85 | pb->buf[0] = 0; | 85 | pb->buf[0] = 0; |
| 86 | pb->buf[sz-1] = ~0; | 86 | pb->buf[sz-1] = ~0; |
| 87 | } | 87 | } |
| @@ -216,7 +216,7 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) | |||
| 216 | } | 216 | } |
| 217 | } | 217 | } |
| 218 | pb_next = pb->next; | 218 | pb_next = pb->next; |
| 219 | pb->next = 0; | 219 | pb->next = NULL; |
| 220 | pb = pb_next; | 220 | pb = pb_next; |
| 221 | } | 221 | } |
| 222 | spin_unlock_bh(&print_lock); | 222 | spin_unlock_bh(&print_lock); |