diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/ieee1394/pcilynx.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/ieee1394/pcilynx.c')
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |