diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-26 00:26:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-26 00:26:51 +0100 |
| commit | 13391c60da3308ed9980de0168f74cce6c62ac1d (patch) | |
| tree | 534fdd1189cd67cd0181b0556b2e027e721e49c8 | |
| parent | fs/pipe: allow sendfile() to pipe again (diff) | |
| parent | crypto: marvel/cesa - Fix tdma descriptor on 64-bit (diff) | |
| download | linux-13391c60da3308ed9980de0168f74cce6c62ac1d.tar.xz linux-13391c60da3308ed9980de0168f74cce6c62ac1d.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"Fix a regression in the cesa driver"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: marvel/cesa - Fix tdma descriptor on 64-bit
| -rw-r--r-- | drivers/crypto/marvell/cesa/cesa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/marvell/cesa/cesa.h b/drivers/crypto/marvell/cesa/cesa.h index fabfaaccca87..fa56b45620c7 100644 --- a/drivers/crypto/marvell/cesa/cesa.h +++ b/drivers/crypto/marvell/cesa/cesa.h @@ -300,11 +300,11 @@ struct mv_cesa_tdma_desc { __le32 byte_cnt; union { __le32 src; - dma_addr_t src_dma; + u32 src_dma; }; union { __le32 dst; - dma_addr_t dst_dma; + u32 dst_dma; }; __le32 next_dma; |