From c9c06167e7933d93a6e396174c68abf242294abb Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 10 Jan 2001 05:27:25 +0000
Subject: Merge with Linux 2.4.0-test12.

---
 drivers/ieee1394/pcilynx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/ieee1394/pcilynx.c')

diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 352f85408..9943c255c 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1457,9 +1457,9 @@ static void remove_card(struct ti_lynx *lynx)
 
         switch (lynx->state) {
         case have_intr:
+                reg_write(lynx, PCI_INT_ENABLE, 0);
                 free_irq(lynx->dev->irq, lynx);
         case have_iomappings:
-                reg_write(lynx, PCI_INT_ENABLE, 0);
                 reg_write(lynx, MISC_CONTROL, MISC_CONTROL_SWRESET);
                 iounmap(lynx->registers);
                 iounmap(lynx->local_rom);
-- 
cgit v1.2.3