diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
|---|---|---|
| committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
| commit | 1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch) | |
| tree | 1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/ahash.c | |
| parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
| parent | 30800d10f2872689cd78711f26b065494df8bb74 (diff) | |
| download | linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip | |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to '')
| -rw-r--r-- | crypto/ahash.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 33a4ff45..b8c59b88 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -78,7 +78,6 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) walk->data -= walk->offset; if (nbytes && walk->offset & alignmask && !err) { - walk->offset += alignmask - 1; walk->offset = ALIGN(walk->offset, alignmask + 1); walk->data += walk->offset; |