[PATCH] ARM: OMAP: CF on OSK broken?

Not sure if this has to be fixed in pcmcia code or our omap_cf.c, but
with patch in attachment I now get:
=> Instert CF card into OSK:
# hda: TOSHIBA THNCF256MDG, CFA DISK drive
ide0 at 0xc2852000-0xc2852007,0xc285200e on irq 222
hda: max request size: 128KiB
hda: 500736 sectors (256 MB) w/2KiB Cache, CHS=978/16/32
hda: cache flushes not supported
    hda: hda1
ide-cs: hda: Vcc = 3.3, Vpp = 0.0
# mount -t vfat /dev/hda1 /mount
    hda: hda1
#

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index c1f6cedb38813d411a49b82f6e6eb32c1075fdc1..61dd5e446eb31bc1947407a4407af03edb004bdd 100644 (file)
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -121,7 +121,8 @@ static int omap_cf_get_status(struct pcmcia_socket *s, u_int *sp)
 
                *sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
                cf = container_of(s, struct omap_cf_socket, socket);
-               s->irq.AssignedIRQ = cf->irq;
+               s->irq.AssignedIRQ = 0;
+               s->pci_irq = cf->irq;
        } else
                *sp = 0;
        return 0;