diff options
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r-- | drivers/ide/icside.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 6352a44ed179..6223b80beb35 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
@@ -410,7 +410,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
410 | { | 410 | { |
411 | void __iomem *base; | 411 | void __iomem *base; |
412 | struct ide_host *host; | 412 | struct ide_host *host; |
413 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 413 | hw_regs_t hw, *hws[] = { &hw }; |
414 | int ret; | 414 | int ret; |
415 | 415 | ||
416 | base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); | 416 | base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); |
@@ -431,7 +431,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) | |||
431 | 431 | ||
432 | icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec); | 432 | icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec); |
433 | 433 | ||
434 | host = ide_host_alloc(&icside_v5_port_info, hws); | 434 | host = ide_host_alloc(&icside_v5_port_info, hws, 1); |
435 | if (host == NULL) | 435 | if (host == NULL) |
436 | return -ENODEV; | 436 | return -ENODEV; |
437 | 437 | ||
@@ -467,7 +467,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
467 | struct ide_host *host; | 467 | struct ide_host *host; |
468 | unsigned int sel = 0; | 468 | unsigned int sel = 0; |
469 | int ret; | 469 | int ret; |
470 | hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL }; | 470 | hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1] }; |
471 | struct ide_port_info d = icside_v6_port_info; | 471 | struct ide_port_info d = icside_v6_port_info; |
472 | 472 | ||
473 | ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); | 473 | ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); |
@@ -507,7 +507,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
507 | icside_setup_ports(&hw[0], easi_base, &icside_cardinfo_v6_1, ec); | 507 | icside_setup_ports(&hw[0], easi_base, &icside_cardinfo_v6_1, ec); |
508 | icside_setup_ports(&hw[1], easi_base, &icside_cardinfo_v6_2, ec); | 508 | icside_setup_ports(&hw[1], easi_base, &icside_cardinfo_v6_2, ec); |
509 | 509 | ||
510 | host = ide_host_alloc(&d, hws); | 510 | host = ide_host_alloc(&d, hws, 2); |
511 | if (host == NULL) | 511 | if (host == NULL) |
512 | return -ENODEV; | 512 | return -ENODEV; |
513 | 513 | ||