From dc4b80dfdc66ad851adbbdcd1027c6ea6351a331 Mon Sep 17 00:00:00 2001
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Date: Fri, 27 Feb 2009 17:59:44 +0000
Subject: [PATCH] --- yaml --- r: 134968 b: refs/heads/master c:
 814c01dc7c533033b4e99981a2e24a6195bfb43c h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/jme.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 550f60af001d..daebbf8a3652 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb352b838d42e66f0267c40249798ffda3c63037
+refs/heads/master: 814c01dc7c533033b4e99981a2e24a6195bfb43c
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
index 47dd47fd0ace..4da81a3602dc 100644
--- a/trunk/drivers/net/jme.c
+++ b/trunk/drivers/net/jme.c
@@ -2589,6 +2589,16 @@ static const struct ethtool_ops jme_ethtool_ops = {
 static int
 jme_pci_dma64(struct pci_dev *pdev)
 {
+	if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
+	    !pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+		if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
+			return 1;
+
+	if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
+	    !pci_set_dma_mask(pdev, DMA_40BIT_MASK))
+		if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))
+			return 1;
+
 	if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
 		if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
 			return 0;