diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
| commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
| tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/ide/ide-lib.c | |
| parent | bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 (diff) | |
| parent | 6593178dd46d64a5bcb0402a4f3acd95b0687abd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/ide-lib.c')
| -rw-r--r-- | drivers/ide/ide-lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index b09a6537c7a8..41d46dbe6c24 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
| @@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on) | |||
| 410 | { | 410 | { |
| 411 | u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */ | 411 | u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */ |
| 412 | 412 | ||
| 413 | if (on && drive->media == ide_disk) { | 413 | if (!PCI_DMA_BUS_IS_PHYS) { |
| 414 | if (!PCI_DMA_BUS_IS_PHYS) | 414 | addr = BLK_BOUNCE_ANY; |
| 415 | addr = BLK_BOUNCE_ANY; | 415 | } else if (on && drive->media == ide_disk) { |
| 416 | else if (HWIF(drive)->pci_dev) | 416 | if (HWIF(drive)->pci_dev) |
| 417 | addr = HWIF(drive)->pci_dev->dma_mask; | 417 | addr = HWIF(drive)->pci_dev->dma_mask; |
| 418 | } | 418 | } |
| 419 | 419 | ||