diff options
| -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, | |||
| 1355 | if (hwif->chipset != ide_dtc2278 || hwif->channel == 0) | 1355 | if (hwif->chipset != ide_dtc2278 || hwif->channel == 0) |
| 1356 | hwif->port_ops = d->port_ops; | 1356 | hwif->port_ops = d->port_ops; |
| 1357 | 1357 | ||
| 1358 | if ((d->host_flags & IDE_HFLAG_SERIALIZE) || | ||
| 1359 | ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) { | ||
| 1360 | if (hwif->mate) | ||
| 1361 | hwif->mate->serialized = hwif->serialized = 1; | ||
| 1362 | } | ||
| 1363 | |||
| 1364 | hwif->swdma_mask = d->swdma_mask; | 1358 | hwif->swdma_mask = d->swdma_mask; |
| 1365 | hwif->mwdma_mask = d->mwdma_mask; | 1359 | hwif->mwdma_mask = d->mwdma_mask; |
| 1366 | hwif->ultra_mask = d->udma_mask; | 1360 | hwif->ultra_mask = d->udma_mask; |
| @@ -1382,6 +1376,12 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | |||
| 1382 | hwif->dma_ops = d->dma_ops; | 1376 | hwif->dma_ops = d->dma_ops; |
| 1383 | } | 1377 | } |
| 1384 | 1378 | ||
| 1379 | if ((d->host_flags & IDE_HFLAG_SERIALIZE) || | ||
| 1380 | ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) { | ||
| 1381 | if (hwif->mate) | ||
| 1382 | hwif->mate->serialized = hwif->serialized = 1; | ||
| 1383 | } | ||
| 1384 | |||
| 1385 | if (d->host_flags & IDE_HFLAG_RQSIZE_256) | 1385 | if (d->host_flags & IDE_HFLAG_RQSIZE_256) |
| 1386 | hwif->rqsize = 256; | 1386 | hwif->rqsize = 256; |
| 1387 | 1387 | ||
