]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
icside: DMA support fix
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 12 Oct 2011 04:45:34 +0000 (04:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Oct 2011 21:04:50 +0000 (17:04 -0400)
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>
drivers/ide/icside.c

index 4a697a238e280e2ce14c627d0d1f4bf053b86b45..8716066a2f2b79c1ddeb1236a9b2091d7bd62f63 100644 (file)
@@ -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)