diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2011-10-12 04:45:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-13 17:04:50 -0400 |
| commit | acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd (patch) | |
| tree | e7c2fe6790992dd632c76c0171ab1429ed7fe67b /drivers/ide/icside.c | |
| parent | 839e7306e5d1ebd57cf12e83d9910b8b2dbe79ba (diff) | |
| download | linux-acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd.tar.gz linux-acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd.tar.bz2 linux-acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd.zip | |
icside: DMA support fix
Fix problem introduced by commit 5e37bdc ("ide: add struct
ide_dma_ops (take 3)"): d.dma_ops shouldn't be cleared if
we are going to use DMA.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 4a697a238e28..8716066a2f2b 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c @@ -521,8 +521,8 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) { d.init_dma = icside_dma_init; d.port_ops = &icside_v6_port_ops; + } else d.dma_ops = NULL; - } ret = ide_host_register(host, &d, hws); if (ret) |