diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /crypto | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ablkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index 98a66103f4f2..a854df2a5a4b 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c | |||
| @@ -165,7 +165,7 @@ static inline int ablkcipher_next_slow(struct ablkcipher_request *req, | |||
| 165 | 165 | ||
| 166 | p = kmalloc(n, GFP_ATOMIC); | 166 | p = kmalloc(n, GFP_ATOMIC); |
| 167 | if (!p) | 167 | if (!p) |
| 168 | ablkcipher_walk_done(req, walk, -ENOMEM); | 168 | return ablkcipher_walk_done(req, walk, -ENOMEM); |
| 169 | 169 | ||
| 170 | base = p + 1; | 170 | base = p + 1; |
| 171 | 171 | ||