diff options
Diffstat (limited to 'drivers/ide/pci/delkin_cb.c')
-rw-r--r-- | drivers/ide/pci/delkin_cb.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index c7b7e048328..b9e457996d0 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c | |||
@@ -87,11 +87,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
87 | 87 | ||
88 | i = hwif->index; | 88 | i = hwif->index; |
89 | 89 | ||
90 | if (hwif->present) | 90 | ide_init_port_data(hwif, i); |
91 | ide_unregister(i); | ||
92 | else | ||
93 | ide_init_port_data(hwif, i); | ||
94 | |||
95 | ide_init_port_hw(hwif, &hw); | 91 | ide_init_port_hw(hwif, &hw); |
96 | hwif->port_ops = &delkin_cb_port_ops; | 92 | hwif->port_ops = &delkin_cb_port_ops; |
97 | 93 | ||
@@ -123,8 +119,7 @@ delkin_cb_remove (struct pci_dev *dev) | |||
123 | { | 119 | { |
124 | ide_hwif_t *hwif = pci_get_drvdata(dev); | 120 | ide_hwif_t *hwif = pci_get_drvdata(dev); |
125 | 121 | ||
126 | if (hwif) | 122 | ide_unregister(hwif); |
127 | ide_unregister(hwif->index); | ||
128 | 123 | ||
129 | pci_release_regions(dev); | 124 | pci_release_regions(dev); |
130 | pci_disable_device(dev); | 125 | pci_disable_device(dev); |