diff --git a/[refs] b/[refs]
index 70bb2dde9c78..08975b7eb493 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f696aa43fadb13a21c4e723fb6e51bf640dd1363
+refs/heads/master: 0c82d3ce2f479c728f99e228d9ae32a9cd853c5a
diff --git a/trunk/drivers/mtd/nand/r852.c b/trunk/drivers/mtd/nand/r852.c
index 06f07bb414a8..96bfbd8e8fdb 100644
--- a/trunk/drivers/mtd/nand/r852.c
+++ b/trunk/drivers/mtd/nand/r852.c
@@ -197,7 +197,7 @@ static void r852_do_dma(struct r852_device *dev, uint8_t *buf, int do_read)
 			R852_DMA_LEN,
 			(do_read ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE));
 
-		if (dev->phys_dma_addr == DMA_ERROR_CODE)
+		if (pci_dma_mapping_error(dev->pci_dev, dev->phys_dma_addr))
 			bounce = 1;
 	}