Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel...

[linux-drm-fsl-dcu.git] / lib / kfifo.c

diff --git a/lib/kfifo.c b/lib/kfifo.c
index 7b7f83027b7b748a4a1497d7804d4b54077d0790..d79b9d222065bd9467e4e091ad850a2ce4d93c94 100644 (file)
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -215,7 +215,7 @@ static unsigned long kfifo_copy_from_user(struct __kfifo *fifo,
         * incrementing the fifo->in index counter
         */
        smp_wmb();
-       *copied = len - ret;
+       *copied = len - ret * esize;
        /* return the number of elements which are not copied */
        return ret;
 }
@@ -275,7 +275,7 @@ static unsigned long kfifo_copy_to_user(struct __kfifo *fifo, void __user *to,
         * incrementing the fifo->out index counter
         */
        smp_wmb();
-       *copied = len - ret;
+       *copied = len - ret * esize;
        /* return the number of elements which are not copied */
        return ret;
 }