summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary R Hook <ghook@amd.com>2017-04-20 15:24:22 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-20 14:28:37 +0200
commit93424b2b63e0765c32e723173689a2d2b78d19ba (patch)
tree3e8c7e2eae773fa0ea4e5617fecb46720342b89f
parent36dffff240d937d626bea9196c027df076fbff34 (diff)
crypto: ccp - Disable interrupts early on unload
commit 116591fe3eef11c6f06b662c9176385f13891183 upstream. Ensure that we disable interrupts first when shutting down the driver. Signed-off-by: Gary R Hook <ghook@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 c85af39cc84d..a6cb07810d6a 100644
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -884,10 +884,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);
}