---

yaml --- r: 14491 b: refs/heads/master c: 6593178 h: refs/heads/master i: 14489: acbc5b5 14487: eb5b101 v: v3
git-mirror · Nov 18, 2005 · 5c58a26 · 5c58a26
1 parent 1fdd06f
commit 5c58a26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37ea218cb43c67bf1578f5e535fcc3a751018ef
+refs/heads/master: 6593178dd46d64a5bcb0402a4f3acd95b0687abd
diff --git a/trunk/drivers/ide/ide-lib.c b/trunk/drivers/ide/ide-lib.c
@@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on)
 {
 	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */
 
-	if (on && drive->media == ide_disk) {
-		if (!PCI_DMA_BUS_IS_PHYS)
-			addr = BLK_BOUNCE_ANY;
-		else if (HWIF(drive)->pci_dev)
+	if (!PCI_DMA_BUS_IS_PHYS) {
+		addr = BLK_BOUNCE_ANY;
+	} else if (on && drive->media == ide_disk) {
+		if (HWIF(drive)->pci_dev)
 			addr = HWIF(drive)->pci_dev->dma_mask;
 	}