diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:08:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:08:21 -0700 |
| commit | d0dcd41d7b463de955b7ae7a55f76ff4216ed665 (patch) | |
| tree | 809426b56df828d7943c0e5919f8056fed10d7f6 | |
| parent | 8dcf5782848600ecfd0df3a45c521b5ad0fcb42e (diff) | |
| parent | 1024c5f4be4fc5b00337464fb8a442bebf15df68 (diff) | |
| download | talos-obmc-linux-d0dcd41d7b463de955b7ae7a55f76ff4216ed665.tar.gz talos-obmc-linux-d0dcd41d7b463de955b7ae7a55f76ff4216ed665.zip | |
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:
ide: IDE_HFLAG_SERIALIZE_DMA bugfix
| -rw-r--r-- | drivers/ide/ide-probe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 591deda3f86a..34b0d4f26b58 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1355,12 +1355,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, if (hwif->chipset != ide_dtc2278 || hwif->channel == 0) hwif->port_ops = d->port_ops; - if ((d->host_flags & IDE_HFLAG_SERIALIZE) || - ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) { - if (hwif->mate) - hwif->mate->serialized = hwif->serialized = 1; - } - hwif->swdma_mask = d->swdma_mask; hwif->mwdma_mask = d->mwdma_mask; hwif->ultra_mask = d->udma_mask; @@ -1382,6 +1376,12 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, hwif->dma_ops = d->dma_ops; } + if ((d->host_flags & IDE_HFLAG_SERIALIZE) || + ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) { + if (hwif->mate) + hwif->mate->serialized = hwif->serialized = 1; + } + if (d->host_flags & IDE_HFLAG_RQSIZE_256) hwif->rqsize = 256; |
