From 0622c018c1e8d736a1e19ae5f066494a390d9037 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 11 Mar 2010 09:25:14 -0800
Subject: [PATCH] --- yaml --- r: 195913 b: refs/heads/master c:
 0c82d3ce2f479c728f99e228d9ae32a9cd853c5a h: refs/heads/master i:   195911:
 221c6c91cf5af2826cf69b09895241e36dee571b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mtd/nand/r852.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 	}