diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-23 16:12:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-23 16:12:39 +0300 |
| commit | c130423620331a104492bbbcc49f25125e26a21a (patch) | |
| tree | a49e8e0bdf07a723d4e73fb6e0cca568b919d4db /drivers/crypto/marvell/cesa.c | |
| parent | 988faa7312b490c8a9e7fcdca434c6bf3f3af97b (diff) | |
| parent | dfe97ad30e8c038261663a18b9e04b8b5bc07bea (diff) | |
| download | linux-c130423620331a104492bbbcc49f25125e26a21a.tar.xz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
API:
- Fix kzalloc error path crash in ecryptfs added by skcipher
conversion. Note the subject of the commit is screwed up and the
correct subject is actually in the body.
Drivers:
- A number of fixes to the marvell cesa hashing code.
- Remove bogus nested irqsave that clobbers the saved flags in ccp"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: marvell/cesa - forward devm_ioremap_resource() error code
crypto: marvell/cesa - initialize hash states
crypto: marvell/cesa - fix memory leak
crypto: ccp - fix lock acquisition code
eCryptfs: Use skcipher and shash
Diffstat (limited to 'drivers/crypto/marvell/cesa.c')
| -rw-r--r-- | drivers/crypto/marvell/cesa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c index c0656e7f37b5..80239ae69527 100644 --- a/drivers/crypto/marvell/cesa.c +++ b/drivers/crypto/marvell/cesa.c @@ -420,7 +420,7 @@ static int mv_cesa_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); cesa->regs = devm_ioremap_resource(dev, res); if (IS_ERR(cesa->regs)) - return -ENOMEM; + return PTR_ERR(cesa->regs); ret = mv_cesa_dev_dma_init(cesa); if (ret) |