From b16664b792204f34b862cba4a5a105d8f0b3ef2e Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Wed, 27 Jan 2010 17:09:38 +0300 Subject: [PATCH] --- yaml --- r: 180626 b: refs/heads/master c: 5a5e0f4c7038168e38d1db6af09d1ac715ee9888 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/kfifo.h | 2 +- trunk/kernel/kfifo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d731aeb9600c..ecb6bcfcebb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c743d0ae60462e91465483dd87f4458d71af550 +refs/heads/master: 5a5e0f4c7038168e38d1db6af09d1ac715ee9888 diff --git a/trunk/include/linux/kfifo.h b/trunk/include/linux/kfifo.h index 6f6c5f300af6..bc0fc795bd35 100644 --- a/trunk/include/linux/kfifo.h +++ b/trunk/include/linux/kfifo.h @@ -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; } /** diff --git a/trunk/kernel/kfifo.c b/trunk/kernel/kfifo.c index 559fb5582b60..35edbe22e9a9 100644 --- a/trunk/kernel/kfifo.c +++ b/trunk/kernel/kfifo.c @@ -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; }