diff options
Diffstat (limited to 'drivers/ide/legacy/ide-cs.c')
| -rw-r--r-- | drivers/ide/legacy/ide-cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 15ccf6944ae2..9a23b94f2939 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
| @@ -156,15 +156,15 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq | |||
| 156 | hw.chipset = ide_pci; | 156 | hw.chipset = ide_pci; |
| 157 | hw.dev = &handle->dev; | 157 | hw.dev = &handle->dev; |
| 158 | 158 | ||
| 159 | hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]); | 159 | hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); |
| 160 | if (hwif == NULL) | 160 | if (hwif == NULL) |
| 161 | return -1; | 161 | return -1; |
| 162 | 162 | ||
| 163 | i = hwif->index; | 163 | i = hwif->index; |
| 164 | 164 | ||
| 165 | if (hwif->present) | 165 | if (hwif->present) |
| 166 | ide_unregister(i, 0, 0); | 166 | ide_unregister(i); |
| 167 | else if (!hwif->hold) | 167 | else |
| 168 | ide_init_port_data(hwif, i); | 168 | ide_init_port_data(hwif, i); |
| 169 | 169 | ||
| 170 | ide_init_port_hw(hwif, &hw); | 170 | ide_init_port_hw(hwif, &hw); |
| @@ -360,7 +360,7 @@ void ide_release(struct pcmcia_device *link) | |||
| 360 | if (info->ndev) { | 360 | if (info->ndev) { |
| 361 | /* FIXME: if this fails we need to queue the cleanup somehow | 361 | /* FIXME: if this fails we need to queue the cleanup somehow |
| 362 | -- need to investigate the required PCMCIA magic */ | 362 | -- need to investigate the required PCMCIA magic */ |
| 363 | ide_unregister(info->hd, 0, 0); | 363 | ide_unregister(info->hd); |
| 364 | } | 364 | } |
| 365 | info->ndev = 0; | 365 | info->ndev = 0; |
| 366 | 366 | ||
