diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:35 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:35 -0500 |
commit | 7cba97f12963721eca648d6901b294750a1fa3bd (patch) | |
tree | 3a384f824b09ffde7662adbb7a7e55af49a78515 | |
parent | 537f06c5deaffbbe155bcc898369f889e7f3e647 (diff) |
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>
-rw-r--r-- | drivers/ide/ide.c | 14 |
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) | |||
530 | 530 | ||
531 | spin_lock_irq(&ide_lock); | 531 | spin_lock_irq(&ide_lock); |
532 | /* | 532 | /* |
533 | * Note that we only release the standard ports, | ||
534 | * and do not even try to handle any extra ports | ||
535 | * allocated for weird IDE interface chipsets. | ||
536 | */ | ||
537 | ide_hwif_release_regions(hwif); | ||
538 | |||
539 | /* | ||
540 | * Remove us from the hwgroup, and free | 533 | * Remove us from the hwgroup, and free |
541 | * the hwgroup if we were the only member | 534 | * the hwgroup if we were the only member |
542 | */ | 535 | */ |
@@ -590,6 +583,13 @@ void ide_unregister(unsigned int index) | |||
590 | hwif->extra_ports = 0; | 583 | hwif->extra_ports = 0; |
591 | } | 584 | } |
592 | 585 | ||
586 | /* | ||
587 | * Note that we only release the standard ports, | ||
588 | * and do not even try to handle any extra ports | ||
589 | * allocated for weird IDE interface chipsets. | ||
590 | */ | ||
591 | ide_hwif_release_regions(hwif); | ||
592 | |||
593 | /* copy original settings */ | 593 | /* copy original settings */ |
594 | tmp_hwif = *hwif; | 594 | tmp_hwif = *hwif; |
595 | 595 | ||