diff options
author | Tom Lendacky <thomas.lendacky@amd.com> | 2014-01-06 13:34:29 -0600 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-01-15 11:33:40 +0800 |
commit | db34cf9122319d6fed59bd3ba26fa099a8ece432 (patch) | |
tree | d161399362984611892d5f42cbe7f186547b9944 /drivers/crypto/ccp/ccp-pci.c | |
parent | 82d1585b9a9d5106ec6a630696f3e2e532fc3cba (diff) | |
download | lwn-db34cf9122319d6fed59bd3ba26fa099a8ece432.tar.gz lwn-db34cf9122319d6fed59bd3ba26fa099a8ece432.zip |
crypto: ccp - CCP device enabled/disabled changes
The CCP cannot be hot-plugged so it will either be there
or it won't. Do not allow the driver to stay loaded if the
CCP does not successfully initialize.
Provide stub routines in the ccp.h file that return -ENODEV
if the CCP has not been configured in the build.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/ccp/ccp-pci.c')
-rw-r--r-- | drivers/crypto/ccp/ccp-pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-pci.c b/drivers/crypto/ccp/ccp-pci.c index f08c16d370cd..93319f9db753 100644 --- a/drivers/crypto/ccp/ccp-pci.c +++ b/drivers/crypto/ccp/ccp-pci.c @@ -267,6 +267,9 @@ static void ccp_pci_remove(struct pci_dev *pdev) struct device *dev = &pdev->dev; struct ccp_device *ccp = dev_get_drvdata(dev); + if (!ccp) + return; + ccp_destroy(ccp); pci_iounmap(pdev, ccp->io_map); |