Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[karo-tx-linux.git] / crypto / hmac.c

diff --git a/crypto/hmac.c b/crypto/hmac.c
index e4eb6ac53b5c0b68e01643ce0ec2be97bca35939..6691981bda1147ec22171791cada8e334e1d29f7 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -160,8 +160,7 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
 
        sg_set_buf(sg1, ipad, bs);
 
-       sg_set_page(&sg[1], (void *) sg);
-       sg1[1].length = 0;
+       sg_set_page(&sg[1], (void *) sg, 0, 0);
        sg_set_buf(sg2, opad, bs + ds);
 
        err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);