ia64/xen-unstable

annotate patches/linux-2.6.16.29/fix-ide-cd-pio-mode.patch @ 11834:3cc0b589c235

Added tag 3.0.3-branched for changeset 6ed4368b4a9e1924c983774c4b1a2b6baf8e98a6
author kfraser@localhost.localdomain
date Tue Oct 17 09:59:11 2006 +0100 (2006-10-17)
parents 041be3f6b38e
children
rev   line source
Christian@11540 1 diff -pruN ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c ./drivers/ide/ide-lib.c
Christian@11540 2 --- ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c 2006-09-12 19:02:10.000000000 +0100
Christian@11540 3 +++ ./drivers/ide/ide-lib.c 2006-09-19 13:59:03.000000000 +0100
Christian@11540 4 @@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *driv
cl349@10171 5 {
cl349@10171 6 u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
cl349@10171 7
cl349@10171 8 - if (!PCI_DMA_BUS_IS_PHYS) {
cl349@10171 9 - addr = BLK_BOUNCE_ANY;
cl349@10171 10 - } else if (on && drive->media == ide_disk) {
cl349@10171 11 - if (HWIF(drive)->pci_dev)
cl349@10171 12 + if (on && drive->media == ide_disk) {
cl349@10171 13 + if (!PCI_DMA_BUS_IS_PHYS)
cl349@10171 14 + addr = BLK_BOUNCE_ANY;
cl349@10171 15 + else if (HWIF(drive)->pci_dev)
cl349@10171 16 addr = HWIF(drive)->pci_dev->dma_mask;
cl349@10171 17 }
cl349@10171 18