Skip to content

Commit

Permalink
icside: use struct ide_port_info also for PCB version 5 (v2)
Browse files Browse the repository at this point in the history
This fixes hwif->channel and drive->dn assignments.

v2:
Fix v5/v6 mismatch noticed by Russell.

Cc: Russell King <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
  • Loading branch information
bzolnier committed Mar 27, 2009
1 parent be0ea69 commit 33050ec
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/ide/icside.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -445,15 +449,15 @@ 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;

state->host = host;

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;

Expand Down

0 comments on commit 33050ec

Please sign in to comment.