Sysace: Don't enable IRQ until after interrupt handler is registered

The previous patch to move the interrupt handler registration moved it
below enabling interrupts which could be a problem if the device is on
a shared interrupt line.  This patch fixes the order.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 5b73471ada7..9e7652dcde6 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1005,11 +1005,6 @@ static int __devinit ace_setup(struct ace_device *ace)
         ace_out(ace, ACE_CTRL, ACE_CTRL_FORCECFGMODE |
                 ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ);
 
-        /* Enable interrupts */
-        val = ace_in(ace, ACE_CTRL);
-        val |= ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ;
-        ace_out(ace, ACE_CTRL, val);
-
         /* Now we can hook up the irq handler */
         if (ace->irq != NO_IRQ) {
                 rc = request_irq(ace->irq, ace_interrupt, 0, "systemace", ace);
@@ -1020,6 +1015,11 @@ static int __devinit ace_setup(struct ace_device *ace)
                 }
         }
 
+        /* Enable interrupts */
+        val = ace_in(ace, ACE_CTRL);
+        val |= ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ;
+        ace_out(ace, ACE_CTRL, val);
+
         /* Print the identification */
         dev_info(ace->dev, "Xilinx SystemACE revision %i.%i.%i\n",
                  (version >> 12) & 0xf, (version >> 8) & 0x0f, version & 0xff);