Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0dcd41d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8dcf5782 1024c5f4

drivers/ide/ide-probe.c

+6 −6
Original line number Diff line number Diff line
@@ -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;