[Xen-changelog] [linux-2.6.18-xen] Imported patch fix-ide-cd-pio-mode.patch from xen-unstable.hg 15200:bd3d6b4c52ec

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1180947923 -3600
# Node ID 18d84fce4960c8eba32b08f7f37ecc831961b48f
# Parent  4763065c587cb72db94f34670803cc9ad0e3041c
Imported patch fix-ide-cd-pio-mode.patch from xen-unstable.hg 15200:bd3d6b4c52ec
---
 drivers/ide/ide-lib.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r 4763065c587c -r 18d84fce4960 drivers/ide/ide-lib.c
--- a/drivers/ide/ide-lib.c     Mon Jun 04 10:05:23 2007 +0100
+++ b/drivers/ide/ide-lib.c     Mon Jun 04 10:05:23 2007 +0100
@@ -408,10 +408,10 @@ void ide_toggle_bounce(ide_drive_t *driv
 {
        u64 addr = BLK_BOUNCE_HIGH;     /* dma64_addr_t */
 
-       if (!PCI_DMA_BUS_IS_PHYS) {
-               addr = BLK_BOUNCE_ANY;
-       } else if (on && drive->media == ide_disk) {
-               if (HWIF(drive)->pci_dev)
+       if (on && drive->media == ide_disk) {
+               if (!PCI_DMA_BUS_IS_PHYS)
+                       addr = BLK_BOUNCE_ANY;
+               else if (HWIF(drive)->pci_dev)
                        addr = HWIF(drive)->pci_dev->dma_mask;
        }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog