ia64/linux-2.6.18-xen.hg

changeset 7:18d84fce4960

Imported patch fix-ide-cd-pio-mode.patch from xen-unstable.hg 15200:bd3d6b4c52ec
author Ian Campbell <ian.campbell@xensource.com>
date Mon Jun 04 10:05:23 2007 +0100 (2007-06-04)
parents 4763065c587c
children aa96379da741
files drivers/ide/ide-lib.c
line diff
     1.1 --- a/drivers/ide/ide-lib.c	Mon Jun 04 10:05:23 2007 +0100
     1.2 +++ b/drivers/ide/ide-lib.c	Mon Jun 04 10:05:23 2007 +0100
     1.3 @@ -408,10 +408,10 @@ void ide_toggle_bounce(ide_drive_t *driv
     1.4  {
     1.5  	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */
     1.6  
     1.7 -	if (!PCI_DMA_BUS_IS_PHYS) {
     1.8 -		addr = BLK_BOUNCE_ANY;
     1.9 -	} else if (on && drive->media == ide_disk) {
    1.10 -		if (HWIF(drive)->pci_dev)
    1.11 +	if (on && drive->media == ide_disk) {
    1.12 +		if (!PCI_DMA_BUS_IS_PHYS)
    1.13 +			addr = BLK_BOUNCE_ANY;
    1.14 +		else if (HWIF(drive)->pci_dev)
    1.15  			addr = HWIF(drive)->pci_dev->dma_mask;
    1.16  	}
    1.17