Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180626
b: refs/heads/master
c: 5a5e0f4
h: refs/heads/master
v: v3
  • Loading branch information
Anton Vorontsov authored and Greg Kroah-Hartman committed Feb 16, 2010
1 parent f6390d5 commit b16664b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c743d0ae60462e91465483dd87f4458d71af550
refs/heads/master: 5a5e0f4c7038168e38d1db6af09d1ac715ee9888
2 changes: 1 addition & 1 deletion trunk/include/linux/kfifo.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ extern __must_check unsigned int kfifo_out_peek(struct kfifo *fifo,
*/
static inline bool kfifo_initialized(struct kfifo *fifo)
{
return fifo->buffer != 0;
return fifo->buffer != NULL;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/kfifo.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ int kfifo_alloc(struct kfifo *fifo, unsigned int size, gfp_t gfp_mask)

buffer = kmalloc(size, gfp_mask);
if (!buffer) {
_kfifo_init(fifo, 0, 0);
_kfifo_init(fifo, NULL, 0);
return -ENOMEM;
}

Expand Down

0 comments on commit b16664b

Please sign in to comment.