git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
crypto
/
stm32
/
stm32-hash.c
diff --git
a/drivers/crypto/stm32/stm32-hash.c
b/drivers/crypto/stm32/stm32-hash.c
index 29519d1c403f4161c87dc971db4d482cd4be513c..23061f2bc74bdf56202490f5a186698ffcf1df04 100644
(file)
--- a/
drivers/crypto/stm32/stm32-hash.c
+++ b/
drivers/crypto/stm32/stm32-hash.c
@@
-349,7
+349,7
@@
static int stm32_hash_xmit_cpu(struct stm32_hash_dev *hdev,
return -ETIMEDOUT;
if ((hdev->flags & HASH_FLAGS_HMAC) &&
return -ETIMEDOUT;
if ((hdev->flags & HASH_FLAGS_HMAC) &&
- (
hdev->flags & ~HASH_FLAGS_HMAC_KEY
)) {
+ (
!(hdev->flags & HASH_FLAGS_HMAC_KEY)
)) {
hdev->flags |= HASH_FLAGS_HMAC_KEY;
stm32_hash_write_key(hdev);
if (stm32_hash_wait_busy(hdev))
hdev->flags |= HASH_FLAGS_HMAC_KEY;
stm32_hash_write_key(hdev);
if (stm32_hash_wait_busy(hdev))
@@
-447,8
+447,8
@@
static int stm32_hash_xmit_dma(struct stm32_hash_dev *hdev,
dma_async_issue_pending(hdev->dma_lch);
dma_async_issue_pending(hdev->dma_lch);
- if (!wait_for_completion_
interruptible_
timeout(&hdev->dma_completion,
-
msecs_to_jiffies(100)))
+ if (!wait_for_completion_timeout(&hdev->dma_completion,
+ msecs_to_jiffies(100)))
err = -ETIMEDOUT;
if (dma_async_is_tx_complete(hdev->dma_lch, cookie,
err = -ETIMEDOUT;
if (dma_async_is_tx_complete(hdev->dma_lch, cookie,