Commit 42800942 authored Feb 11, 2008 by Bartlomiej Zolnierkiewicz

ide: ide_init_port() bugfix



On Sunday 10 February 2008, Atsushi Nemoto wrote:
> On Sun, 06 Jan 2008 18:03:10 +0100, Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
> > +	/* reset DMA masks only for SFF-style DMA controllers */
> > +	if ((d->host_flags && IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0)
> > +		hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0;
> 
> It might be too late, but "host_flags && IDE_HFLAGS_NO_DMA" seems
> wrong for me.

Fix regression caused by commmit c413b9b9
("ide: add struct ide_port_info instances to legacy host drivers").

Reported-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent 395d8ef5

drivers/ide/ide-probe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1355,7 +1355,7 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
		hwif->ultra_mask = d->udma_mask;

		/* reset DMA masks only for SFF-style DMA controllers */
		if ((d->host_flags && IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0)
		if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0)
		hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0;

		if (d->host_flags & IDE_HFLAG_RQSIZE_256)

Admin message