aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-10 18:32:15 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-10 18:32:15 -0500
commit428009422584cb8ded31397740ade88a36fc8172 (patch)
treea6bcfcabac487cd608ae843eaea0f16ff2010d0f /drivers/ide
parent395d8ef5bebe547a80737692f9789d2e36da16f2 (diff)
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 c413b9b94d9a8e7548cc4b2e04b7df0439ce76fd ("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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 6daea896c5db..d6d3330ec081 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1355,7 +1355,7 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
1355 hwif->ultra_mask = d->udma_mask; 1355 hwif->ultra_mask = d->udma_mask;
1356 1356
1357 /* reset DMA masks only for SFF-style DMA controllers */ 1357 /* reset DMA masks only for SFF-style DMA controllers */
1358 if ((d->host_flags && IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0) 1358 if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0 && hwif->dma_base == 0)
1359 hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0; 1359 hwif->swdma_mask = hwif->mwdma_mask = hwif->ultra_mask = 0;
1360 1360
1361 if (d->host_flags & IDE_HFLAG_RQSIZE_256) 1361 if (d->host_flags & IDE_HFLAG_RQSIZE_256)