1 files changed, 6 insertions, 4 deletions

diff --git a/lib/find_next_bit.c b/lib/find_next_bit.c
index c093ba988003..7667c3d907d3 100644
--- a/lib/find_next_bit.c
+++ b/lib/find_next_bit.c
@@ -185,15 +185,16 @@ static inline unsigned long ext2_swab(const unsigned long y)
 #endif
 }
 
-unsigned long find_next_zero_bit_le(const unsigned long *addr, unsigned
+unsigned long find_next_zero_bit_le(const void *addr, unsigned
                 long size, unsigned long offset)
 {
-        const unsigned long *p = addr + BITOP_WORD(offset);
+        const unsigned long *p = addr;
         unsigned long result = offset & ~(BITS_PER_LONG - 1);
         unsigned long tmp;
 
         if (offset >= size)
                 return size;
+        p += BITOP_WORD(offset);
         size -= result;
         offset &= (BITS_PER_LONG - 1UL);
         if (offset) {
@@ -228,15 +229,16 @@ found_middle_swap:
 }
 EXPORT_SYMBOL(find_next_zero_bit_le);
 
-unsigned long find_next_bit_le(const unsigned long *addr, unsigned
+unsigned long find_next_bit_le(const void *addr, unsigned
                 long size, unsigned long offset)
 {
-        const unsigned long *p = addr + BITOP_WORD(offset);
+        const unsigned long *p = addr;
         unsigned long result = offset & ~(BITS_PER_LONG - 1);
         unsigned long tmp;
 
         if (offset >= size)
                 return size;
+        p += BITOP_WORD(offset);
         size -= result;
         offset &= (BITS_PER_LONG - 1UL);
         if (offset) {