mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
Ian Campbell
3bd852f207
No changes required to sparse tree or patches directory. Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
19 lines
659 B
Diff
19 lines
659 B
Diff
diff -pruN ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c ./drivers/ide/ide-lib.c
|
|
--- ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c 2006-09-12 19:02:10.000000000 +0100
|
|
+++ ./drivers/ide/ide-lib.c 2006-09-19 13:59:03.000000000 +0100
|
|
@@ -410,10 +410,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;
|
|
}
|
|
|