diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:23:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 22:23:49 -0500 |
| commit | 017f51788ffdc16b0168143e38ea2c1f3551d983 (patch) | |
| tree | 5ec33c9b638c4e86a1dcafd6528e8f6482549483 /drivers/ide/icside.c | |
| parent | 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (diff) | |
| parent | d224b6269e4731a82f648bb0281ea1a4d8b3311d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
icside: fix PCB version 6 support (v2)
tx4939ide: typo fix and minor cleanup
ide: add CS5536 host driver (v3)
ide: Force VIA IDE legacy interrupts for AmigaOne boards
IDE: Unregister and disable devices if initialization fails.
ide: fix ide_register_port() failure handling
ide: struct device - replace bus_id with dev_name(), dev_set_name()
ide-cd: fix DMA for non bio-backed requests
Diffstat (limited to 'drivers/ide/icside.c')
| -rw-r--r-- | drivers/ide/icside.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 97a35c667aee..415d7e24f2b6 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
| @@ -534,7 +534,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
| 534 | d.dma_ops = NULL; | 534 | d.dma_ops = NULL; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | ret = ide_host_register(host, NULL, hws); | 537 | ret = ide_host_register(host, &d, hws); |
| 538 | if (ret) | 538 | if (ret) |
| 539 | goto err_free; | 539 | goto err_free; |
| 540 | 540 | ||