summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:35 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:35 +0100
commit7cba97f12963721eca648d6901b294750a1fa3bd (patch)
tree3a384f824b09ffde7662adbb7a7e55af49a78515 /drivers/ide/ide.c
parent537f06c5deaffbbe155bcc898369f889e7f3e647 (diff)
downloadblackbird-op-linux-7cba97f12963721eca648d6901b294750a1fa3bd.tar.gz
blackbird-op-linux-7cba97f12963721eca648d6901b294750a1fa3bd.zip
ide: I/O resources are released too early in ide_unregister()
Release I/O resources after releasing DMA. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 7fa30acf0fc5..ea7512d99dec 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -530,13 +530,6 @@ void ide_unregister(unsigned int index)
spin_lock_irq(&ide_lock);
/*
- * Note that we only release the standard ports,
- * and do not even try to handle any extra ports
- * allocated for weird IDE interface chipsets.
- */
- ide_hwif_release_regions(hwif);
-
- /*
* Remove us from the hwgroup, and free
* the hwgroup if we were the only member
*/
@@ -590,6 +583,13 @@ void ide_unregister(unsigned int index)
hwif->extra_ports = 0;
}
+ /*
+ * Note that we only release the standard ports,
+ * and do not even try to handle any extra ports
+ * allocated for weird IDE interface chipsets.
+ */
+ ide_hwif_release_regions(hwif);
+
/* copy original settings */
tmp_hwif = *hwif;
OpenPOWER on IntegriCloud