Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33050ec7 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent be0ea696

drivers/ide/icside.c

+6 −2
Original line number Diff line number Diff line
@@ -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;