diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:04:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:04:12 +0100 |
| commit | ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a (patch) | |
| tree | 2223e34469b7d70a2c740b55379fd09ff95257b6 /drivers/ide/icside.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | cy82c693: fix PCI device selection (diff) | |
| download | linux-ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a.tar.xz linux-ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
cy82c693: fix PCI device selection
icside: DMA support fix
IDE: Don't powerdown Compaq Triflex IDE device on suspend
piix: ICH7 MWDMA1 errata
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) |