diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/s390/crypto/sha_common.c | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/s390/crypto/sha_common.c')
| -rw-r--r-- | arch/s390/crypto/sha_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c index f42dbabc0d30..48884f89ab92 100644 --- a/arch/s390/crypto/sha_common.c +++ b/arch/s390/crypto/sha_common.c | |||
| @@ -38,6 +38,7 @@ int s390_sha_update(struct shash_desc *desc, const u8 *data, unsigned int len) | |||
| 38 | BUG_ON(ret != bsize); | 38 | BUG_ON(ret != bsize); |
| 39 | data += bsize - index; | 39 | data += bsize - index; |
| 40 | len -= bsize - index; | 40 | len -= bsize - index; |
| 41 | index = 0; | ||
| 41 | } | 42 | } |
| 42 | 43 | ||
| 43 | /* process as many blocks as possible */ | 44 | /* process as many blocks as possible */ |