diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-10 18:37:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-10 18:37:43 +0200 |
| commit | c08e611b7d0169b513e3b4515ffd51ac7f37f22c (patch) | |
| tree | 42743a910ce392cfaa061d42dc464c87219305a7 /drivers/crypto/caam/intern.h | |
| parent | Linux 4.11-rc6 (diff) | |
| parent | crypto: caam - fix RNG deinstantiation error checking (diff) | |
| download | linux-c08e611b7d0169b513e3b4515ffd51ac7f37f22c.tar.xz linux-c08e611b7d0169b513e3b4515ffd51ac7f37f22c.zip | |
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 a number of bugs in the caam driver:
- device creation fails after release
- error-path NULL-pointer dereference
- spurious hardware error in RNG deinstantiation"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix RNG deinstantiation error checking
crypto: caam - fix invalid dereference in caam_rsa_init_tfm()
crypto: caam - fix JR platform device subsequent (re)creations
Diffstat (limited to 'drivers/crypto/caam/intern.h')
| -rw-r--r-- | drivers/crypto/caam/intern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index e2bcacc1a921..dbed8baeebe5 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h @@ -66,7 +66,6 @@ struct caam_drv_private_jr { struct caam_drv_private { struct device *dev; - struct platform_device **jrpdev; /* Alloc'ed array per sub-device */ struct platform_device *pdev; /* Physical-presence section */ |