X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fide%2Fide-lib.c;h=b42940d8bf70e68661412ba554967f9b8f160737;hb=36501650ec45b1db308c3b51886044863be2d762;hp=9b44fbdfe41fc503d085b6a0f08c1d3a9775d8fe;hpb=f6fb786d6dcdd7d730e4fba620b071796f487e1b;p=deliverable%2Flinux.git

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 9b44fbdfe41f..b42940d8bf70 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -358,8 +358,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on)
 	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;
+		struct device *dev = drive->hwif->dev;
+
+		if (dev && dev->dma_mask)
+			addr = *dev->dma_mask;
 	}
 
 	if (drive->queue)