diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /crypto/ablkcipher.c | |
| parent | e910b63d009701ad4ebbeb089aba35707fa5d68e (diff) | |
| parent | 5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff) | |
Merge branch 'shmobile' into devel
Diffstat (limited to 'crypto/ablkcipher.c')
| -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 | ||