From 5c58a26cba1b95b05b8adfb2e0f2a9cb02cce82b Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Fri, 18 Nov 2005 23:13:33 +0100 Subject: [PATCH] --- yaml --- r: 14491 b: refs/heads/master c: 6593178dd46d64a5bcb0402a4f3acd95b0687abd h: refs/heads/master i: 14489: acbc5b5836fe3db76ec5b334f870a90597def041 14487: eb5b1010dccbda858b719cfdd067bfab540e6991 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-lib.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 248a014145af..12c7cc993c0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c37ea218cb43c67bf1578f5e535fcc3a751018ef +refs/heads/master: 6593178dd46d64a5bcb0402a4f3acd95b0687abd diff --git a/trunk/drivers/ide/ide-lib.c b/trunk/drivers/ide/ide-lib.c index b09a6537c7a8..41d46dbe6c24 100644 --- a/trunk/drivers/ide/ide-lib.c +++ b/trunk/drivers/ide/ide-lib.c @@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on) { u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */ - if (on && drive->media == ide_disk) { - if (!PCI_DMA_BUS_IS_PHYS) - addr = BLK_BOUNCE_ANY; - else if (HWIF(drive)->pci_dev) + if (!PCI_DMA_BUS_IS_PHYS) { + addr = BLK_BOUNCE_ANY; + } else if (on && drive->media == ide_disk) { + if (HWIF(drive)->pci_dev) addr = HWIF(drive)->pci_dev->dma_mask; }