diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/pohmelfs/crypto.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/pohmelfs/crypto.c')
| -rw-r--r-- | drivers/staging/pohmelfs/crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c index 19781ad..884183c 100644 --- a/drivers/staging/pohmelfs/crypto.c +++ b/drivers/staging/pohmelfs/crypto.c @@ -176,7 +176,7 @@ static int pohmelfs_crypto_process(struct ablkcipher_request *req, timeout); if (!err) err = -ETIMEDOUT; - else + else if (err > 0) err = complete.error; break; default: @@ -738,7 +738,7 @@ static int pohmelfs_crypto_init_handshake(struct pohmelfs_sb *psb) psb->wait_on_page_timeout); if (!err) err = -ETIMEDOUT; - else + else if (err > 0) err = -psb->flags; if (!err) |