From 110f7ad9c8c573728a3975521eece63d3d968062 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 23:09:35 +0100 Subject: [PATCH] --- yaml --- r: 82158 b: refs/heads/master c: 7cba97f12963721eca648d6901b294750a1fa3bd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 40469666dfb0..af03b463bca7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 537f06c5deaffbbe155bcc898369f889e7f3e647 +refs/heads/master: 7cba97f12963721eca648d6901b294750a1fa3bd diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index 7fa30acf0fc5..ea7512d99dec 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/drivers/ide/ide.c @@ -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 @@ -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;