diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /lib/find_bit.c | |
| parent | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (diff) | |
| parent | af22a610bc38508d5ea760507d31be6b6983dfa8 (diff) | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to 'lib/find_bit.c')
| -rw-r--r-- | lib/find_bit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/find_bit.c b/lib/find_bit.c index 18072ea9c20e..6ed74f78380c 100644 --- a/lib/find_bit.c +++ b/lib/find_bit.c | |||
| @@ -33,7 +33,7 @@ static unsigned long _find_next_bit(const unsigned long *addr, | |||
| 33 | { | 33 | { |
| 34 | unsigned long tmp; | 34 | unsigned long tmp; |
| 35 | 35 | ||
| 36 | if (!nbits || start >= nbits) | 36 | if (unlikely(start >= nbits)) |
| 37 | return nbits; | 37 | return nbits; |
| 38 | 38 | ||
| 39 | tmp = addr[start / BITS_PER_LONG] ^ invert; | 39 | tmp = addr[start / BITS_PER_LONG] ^ invert; |
| @@ -151,7 +151,7 @@ static unsigned long _find_next_bit_le(const unsigned long *addr, | |||
| 151 | { | 151 | { |
| 152 | unsigned long tmp; | 152 | unsigned long tmp; |
| 153 | 153 | ||
| 154 | if (!nbits || start >= nbits) | 154 | if (unlikely(start >= nbits)) |
| 155 | return nbits; | 155 | return nbits; |
| 156 | 156 | ||
| 157 | tmp = addr[start / BITS_PER_LONG] ^ invert; | 157 | tmp = addr[start / BITS_PER_LONG] ^ invert; |