Skip to content

Commit

Permalink
ide: I/O resources are released too early in ide_unregister()
Browse files Browse the repository at this point in the history
Release I/O resources after releasing DMA.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 1, 2008
1 parent 537f06c commit 7cba97f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,13 +529,6 @@ void ide_unregister(unsigned int index)
free_irq(hwif->irq, hwgroup);

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
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 7cba97f

Please sign in to comment.