]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
icside: use struct ide_port_info also for PCB version 5 (v2)
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:17 +0000 (12:46 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 27 Mar 2009 11:46:17 +0000 (12:46 +0100)
This fixes hwif->channel and drive->dn assignments.

v2:
Fix v5/v6 mismatch noticed by Russell.

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/icside.c

index 415d7e24f2b64784c0d8c887958777bea150078a..0cf47e6e9793e0da31b74fb01dcb1c1b5f143ba0 100644 (file)
@@ -419,6 +419,10 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
        hw->chipset = ide_acorn;
 }
 
+static const struct ide_port_info icside_v5_port_info = {
+       .host_flags             = IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
@@ -445,7 +449,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
        icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
 
-       host = ide_host_alloc(NULL, hws);
+       host = ide_host_alloc(&icside_v5_port_info, hws);
        if (host == NULL)
                return -ENODEV;
 
@@ -453,7 +457,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
        ecard_set_drvdata(ec, state);
 
-       ret = ide_host_register(host, NULL, hws);
+       ret = ide_host_register(host, &icside_v5_port_info, hws);
        if (ret)
                goto err_free;