diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 18:17:34 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 18:17:34 +0200 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /drivers/ide/arm/palm_bk3710.c | |
| parent | Merge branch 'omap2-upstream' into devel (diff) | |
| parent | [ARM] Remove leds-tosa.c (diff) | |
| download | linux-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.tar.xz linux-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.zip | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'drivers/ide/arm/palm_bk3710.c')
| -rw-r--r-- | drivers/ide/arm/palm_bk3710.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index 8e1f6bd33887..474162cdf665 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c @@ -378,15 +378,15 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) hw.irq = irq->start; hw.chipset = ide_palm3710; - hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]); + hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); if (hwif == NULL) goto out; i = hwif->index; if (hwif->present) - ide_unregister(i, 0, 0); - else if (!hwif->hold) + ide_unregister(i); + else ide_init_port_data(hwif, i); ide_init_port_hw(hwif, &hw); |