diff options
author | Hannes Reinecke <hare@suse.de> | 2005-11-09 16:47:18 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2005-11-09 16:47:18 -0500 |
commit | 4349d5cdf28d46c22d467079e80ee9695dcec0ad (patch) | |
tree | f16b8cb1689a82ebb48d95f9be2f66b56fb62189 /drivers/ide/legacy | |
parent | a5ee3634630c218e86afc5bae2acb55b9e47625d (diff) |
[PATCH] ide: incorrect device link for ide-cs
Devices driven by ide-cs will appear under /sys/devices instead of the
appropriate PCMCIA device. To fix this I had to extend the hw_regs_t
structure with a 'struct device' field, which allows us to set the
parent link for the appropriate hwif.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy')
-rw-r--r-- | drivers/ide/legacy/ide-cs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 1dafffa7e513..ef79805218e4 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
@@ -182,13 +182,14 @@ static void ide_detach(dev_link_t *link) | |||
182 | 182 | ||
183 | } /* ide_detach */ | 183 | } /* ide_detach */ |
184 | 184 | ||
185 | static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq) | 185 | static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle) |
186 | { | 186 | { |
187 | hw_regs_t hw; | 187 | hw_regs_t hw; |
188 | memset(&hw, 0, sizeof(hw)); | 188 | memset(&hw, 0, sizeof(hw)); |
189 | ide_init_hwif_ports(&hw, io, ctl, NULL); | 189 | ide_init_hwif_ports(&hw, io, ctl, NULL); |
190 | hw.irq = irq; | 190 | hw.irq = irq; |
191 | hw.chipset = ide_pci; | 191 | hw.chipset = ide_pci; |
192 | hw.dev = &handle->dev; | ||
192 | return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); | 193 | return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave); |
193 | } | 194 | } |
194 | 195 | ||
@@ -327,12 +328,12 @@ static void ide_config(dev_link_t *link) | |||
327 | 328 | ||
328 | /* retry registration in case device is still spinning up */ | 329 | /* retry registration in case device is still spinning up */ |
329 | for (hd = -1, i = 0; i < 10; i++) { | 330 | for (hd = -1, i = 0; i < 10; i++) { |
330 | hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ); | 331 | hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, handle); |
331 | if (hd >= 0) break; | 332 | if (hd >= 0) break; |
332 | if (link->io.NumPorts1 == 0x20) { | 333 | if (link->io.NumPorts1 == 0x20) { |
333 | outb(0x02, ctl_base + 0x10); | 334 | outb(0x02, ctl_base + 0x10); |
334 | hd = idecs_register(io_base + 0x10, ctl_base + 0x10, | 335 | hd = idecs_register(io_base + 0x10, ctl_base + 0x10, |
335 | link->irq.AssignedIRQ); | 336 | link->irq.AssignedIRQ, handle); |
336 | if (hd >= 0) { | 337 | if (hd >= 0) { |
337 | io_base += 0x10; | 338 | io_base += 0x10; |
338 | ctl_base += 0x10; | 339 | ctl_base += 0x10; |