Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma...

[karo-tx-linux.git] / lib / kfifo.c

diff --git a/lib/kfifo.c b/lib/kfifo.c
index 59dcf5b81d24eae5580638547fbbe026a18566f2..7b7f83027b7b748a4a1497d7804d4b54077d0790 100644 (file)
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -42,8 +42,7 @@ int __kfifo_alloc(struct __kfifo *fifo, unsigned int size,
         * round down to the next power of 2, since our 'let the indices
         * wrap' technique works only in this case.
         */
-       if (!is_power_of_2(size))
-               size = rounddown_pow_of_two(size);
+       size = roundup_pow_of_two(size);
 
        fifo->in = 0;
        fifo->out = 0;
@@ -83,8 +82,7 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer,
 {
        size /= esize;
 
-       if (!is_power_of_2(size))
-               size = rounddown_pow_of_two(size);
+       size = roundup_pow_of_two(size);
 
        fifo->in = 0;
        fifo->out = 0;