summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/ccp
diff options
context:
space:
mode:
authorGary R Hook2017-04-20 22:24:22 +0200
committerHerbert Xu2017-04-21 14:30:57 +0200
commit116591fe3eef11c6f06b662c9176385f13891183 (patch)
tree5349af5586727bc95d07779c5ce5ae4f562abd79 /drivers/crypto/ccp
parentcrypto: ccp - Use only the relevant interrupt bits (diff)
downloadkernel-qcow2-linux-116591fe3eef11c6f06b662c9176385f13891183.tar.gz
kernel-qcow2-linux-116591fe3eef11c6f06b662c9176385f13891183.tar.xz
kernel-qcow2-linux-116591fe3eef11c6f06b662c9176385f13891183.zip
crypto: ccp - Disable interrupts early on unload
Ensure that we disable interrupts first when shutting down the driver. Cc: <stable@vger.kernel.org> # 4.9.x+ Signed-off-by: Gary R Hook <ghook@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/ccp')
-rw-r--r--drivers/crypto/ccp/ccp-dev-v5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c
index c7972e733e43..13b81a1c1184 100644
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -942,10 +942,10 @@ static void ccp5_destroy(struct ccp_device *ccp)
iowrite32(cmd_q->qcontrol & ~CMD5_Q_RUN, cmd_q->reg_control);
/* Disable the interrupts */
- iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status);
+ iowrite32(0x00, cmd_q->reg_int_enable);
/* Clear the interrupt status */
- iowrite32(0x00, cmd_q->reg_int_enable);
+ iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status);
ioread32(cmd_q->reg_int_status);
ioread32(cmd_q->reg_status);
}