xfrm: state: simplify rcu_read_unlock handling in two spots

[mirror_ubuntu-artful-kernel.git] / crypto / skcipher.c

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index aca07c643d4147a29cf817f1ccf1f69b6172dcfc..0e1e6c35188e24185423e91a93ef2ffea29902e0 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -226,7 +226,9 @@ static int skcipher_next_slow(struct skcipher_walk *walk, unsigned int bsize)
        void *v;
 
        if (!phys) {
-               buffer = walk->buffer ?: walk->page;
+               if (!walk->buffer)
+                       walk->buffer = walk->page;
+               buffer = walk->buffer;
                if (buffer)
                        goto ok;
        }