diff --git a/[refs] b/[refs] index 4a29423334a5..4ef6fae66f27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4630f9fd8cdc14eb1caa08dafe649eb5ae09985 +refs/heads/master: 32528d0fbda1093eeeaa7d0a2c498bbb5154099d diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c index 97586afbe63b..d8f8ec320213 100644 --- a/trunk/crypto/blkcipher.c +++ b/trunk/crypto/blkcipher.c @@ -65,7 +65,7 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk) static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len) { u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK); - return start < end_page ? start : end_page; + return start > end_page ? start : end_page; } static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,