Attachment 46282 Details for Bug 104670

[patch] ide-cs-correct-device-link

ide-cs-correct-device-link (text/plain), 1.88 KB, created by Hannes Reinecke on 2005-08-17 12:07:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hannes Reinecke

Created: 2005-08-17 12:07:56 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
>--- a/drivers/ide/ide.c
>+++ b/drivers/ide/ide.c
>@@ -803,6 +803,7 @@ found:
> 	hwif->irq = hw->irq;
> 	hwif->noprobe = 0;
> 	hwif->chipset = hw->chipset;
>+	hwif->gendev.parent = hw->dev;
> 
> 	if (!initializing) {
> 		probe_hwif_init_with_fixup(hwif, fixup);
>diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
>--- 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)
>     
> } /* ide_detach */
> 
>-static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq)
>+static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle)
> {
>     hw_regs_t hw;
>     memset(&hw, 0, sizeof(hw));
>-    ide_init_hwif_ports(&hw, io, ctl, NULL);
>+    ide_std_init_ports(&hw, io, ctl);
>     hw.irq = irq;
>     hw.chipset = ide_pci;
>+    hw.dev = &handle->dev;
>     return ide_register_hw_with_fixup(&hw, NULL, ide_undecoded_slave);
> }
> 
>@@ -328,12 +329,12 @@ static void ide_config(dev_link_t *link)
> 
>     /* retry registration in case device is still spinning up */
>     for (hd = -1, i = 0; i < 10; i++) {
>-	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ);
>+	hd = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, handle);
> 	if (hd >= 0) break;
> 	if (link->io.NumPorts1 == 0x20) {
> 	    outb(0x02, ctl_base + 0x10);
> 	    hd = idecs_register(io_base + 0x10, ctl_base + 0x10,
>-				link->irq.AssignedIRQ);
>+				link->irq.AssignedIRQ, handle);
> 	    if (hd >= 0) {
> 		io_base += 0x10;
> 		ctl_base += 0x10;
>diff --git a/include/linux/ide.h b/include/linux/ide.h
>--- a/include/linux/ide.h
>+++ b/include/linux/ide.h
>@@ -230,6 +230,7 @@ typedef struct hw_regs_s {
> 	int		dma;			/* our dma entry */
> 	ide_ack_intr_t	*ack_intr;		/* acknowledge interrupt */
> 	hwif_chipset_t  chipset;
>+	struct device	*dev;
> } hw_regs_t;
> 
> /*

Actions: View | Diff

Attachments on bug 104670: 46282