ia64/xen-unstable

view patches/linux-2.6.16.13/fix-ide-cd-pio-mode.patch @ 10912:ee6014279103

[LINUX] Clarify a confusing error message in xenbus_probe.c.

Signed-off-by: Michael LeMay <mdlemay@epoch.ncsc.mil>
author kfraser@localhost.localdomain
date Wed Aug 02 14:59:22 2006 +0100 (2006-08-02)
parents ad33b3882867
children
line source
1 diff -ru ../pristine-linux-2.6.16.13/drivers/ide/ide-lib.c ./drivers/ide/ide-lib.c
2 --- ../pristine-linux-2.6.16.13/drivers/ide/ide-lib.c 2006-05-02 22:38:44.000000000 +0100
3 +++ ./drivers/ide/ide-lib.c 2006-05-24 18:37:05.000000000 +0100
4 @@ -410,10 +410,10 @@
5 {
6 u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
8 - if (!PCI_DMA_BUS_IS_PHYS) {
9 - addr = BLK_BOUNCE_ANY;
10 - } else if (on && drive->media == ide_disk) {
11 - if (HWIF(drive)->pci_dev)
12 + if (on && drive->media == ide_disk) {
13 + if (!PCI_DMA_BUS_IS_PHYS)
14 + addr = BLK_BOUNCE_ANY;
15 + else if (HWIF(drive)->pci_dev)
16 addr = HWIF(drive)->pci_dev->dma_mask;
17 }