summaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 19:56:39 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 19:56:39 +0100
commit909f4369bca30f9a186316a3bf2b4a9c1e702a25 (patch)
tree94d60a080255dec2eef36ff1cf1e0b7479d5f573 /drivers/ide/arm
parent9e016a719209d95338e314b46c3012cc7feaaeec (diff)
downloadblackbird-op-linux-909f4369bca30f9a186316a3bf2b4a9c1e702a25.tar.gz
blackbird-op-linux-909f4369bca30f9a186316a3bf2b4a9c1e702a25.zip
ide: fix ide_unregister() usage in host drivers
bast-ide.c/ide-cs.c/delkin_cb.c: * Don't set 'restore' flag for ide_unregister() when initializing new interface. rapide.c/ide-pnp.c/ide-cs.c/ide_platform.c/au1xxx-ide.c/delkin_cb.c/scc_pata.c: * Don't set 'init_default' and 'restore' flags for ide_unregister() when removing interface. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r--drivers/ide/arm/bast-ide.c2
-rw-r--r--drivers/ide/arm/rapide.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index 2864f5aca3f1..0e7574c0ee60 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -53,7 +53,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
i = hwif->index;
if (hwif->present)
- ide_unregister(i, 0, 1);
+ ide_unregister(i, 0, 0);
else if (!hwif->hold)
ide_init_port_data(hwif, i);
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 823d3331318d..efba00d2fc37 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -76,7 +76,7 @@ static void __devexit rapide_remove(struct expansion_card *ec)
ecard_set_drvdata(ec, NULL);
- ide_unregister(hwif->index, 1, 1);
+ ide_unregister(hwif->index, 0, 0);
ecard_release_resources(ec);
}
OpenPOWER on IntegriCloud