aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/icside.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:17 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:17 -0400
commit33050ec7a2b83bc048b2322c79af25df6fdcb879 (patch)
tree9b49b2f4e69a516f0f2d451639b92a9bd7763281 /drivers/ide/icside.c
parentbe0ea69674ed95e1e98cb3687a241badc756d228 (diff)
icside: use struct ide_port_info also for PCB version 5 (v2)
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>
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r--drivers/ide/icside.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 415d7e24f2b6..0cf47e6e9793 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -419,6 +419,10 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
419 hw->chipset = ide_acorn; 419 hw->chipset = ide_acorn;
420} 420}
421 421
422static const struct ide_port_info icside_v5_port_info = {
423 .host_flags = IDE_HFLAG_NO_DMA,
424};
425
422static int __devinit 426static int __devinit
423icside_register_v5(struct icside_state *state, struct expansion_card *ec) 427icside_register_v5(struct icside_state *state, struct expansion_card *ec)
424{ 428{
@@ -445,7 +449,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
445 449
446 icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec); 450 icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
447 451
448 host = ide_host_alloc(NULL, hws); 452 host = ide_host_alloc(&icside_v5_port_info, hws);
449 if (host == NULL) 453 if (host == NULL)
450 return -ENODEV; 454 return -ENODEV;
451 455
@@ -453,7 +457,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
453 457
454 ecard_set_drvdata(ec, state); 458 ecard_set_drvdata(ec, state);
455 459
456 ret = ide_host_register(host, NULL, hws); 460 ret = ide_host_register(host, &icside_v5_port_info, hws);
457 if (ret) 461 if (ret)
458 goto err_free; 462 goto err_free;
459 463