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>

diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c
index 4e9436b98bac3e853648997bf933e5d2612f3186..e16c86447c900c366ff427c2192d93ec21e3f5a7 100644 (file)
--- 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);
        }