summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary R Hook <ghook@amd.com>2017-04-20 23:24:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-20 15:30:58 +0300
commit595c7ad3c64bf99b0aed83ddeb2183735fbf28d7 (patch)
tree37653806aa6d89a3b82be580b358501aec71b444
parente1adc5e04af5add90c25f285df7516a86cfc770d (diff)
downloadlinux-595c7ad3c64bf99b0aed83ddeb2183735fbf28d7.tar.xz
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 4e9436b98bac..e16c86447c90 100644
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -888,10 +888,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);
}