Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] cts: Init SG tables

+6
+6
crypto/cts.c
··· 89 if (lastn < 0) 90 return -EINVAL; 91 92 memset(s, 0, sizeof(s)); 93 scatterwalk_map_and_copy(s, src, offset, nbytes, 0); 94 ··· 174 175 if (lastn < 0) 176 return -EINVAL; 177 178 scatterwalk_map_and_copy(s, src, offset, nbytes, 0); 179
··· 89 if (lastn < 0) 90 return -EINVAL; 91 92 + sg_init_table(sgsrc, 1); 93 + sg_init_table(sgdst, 1); 94 + 95 memset(s, 0, sizeof(s)); 96 scatterwalk_map_and_copy(s, src, offset, nbytes, 0); 97 ··· 171 172 if (lastn < 0) 173 return -EINVAL; 174 + 175 + sg_init_table(sgsrc, 1); 176 + sg_init_table(sgdst, 1); 177 178 scatterwalk_map_and_copy(s, src, offset, nbytes, 0); 179