From 08fd32ace076df7e4316bb4594578f4b8bcea505 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Thu, 12 Jun 2008 15:33:13 +0200
Subject: [PATCH] --- yaml --- r: 98211 b: refs/heads/master c:
 e6340361f9c70e84312caed98c6e058ac6234e9b h: refs/heads/master i:   98209:
 0604c15f952e390176204794e46a320e2e5b9f55   98207:
 8458375e036f5f8a2819a967e1b8037204f7e503 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/ssb/main.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e5d29d3a4720..bbe7350cc6dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6847aa5cce6e22c3625a243b02909ac46aafa110
+refs/heads/master: e6340361f9c70e84312caed98c6e058ac6234e9b
diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c
index 7cf8851286b5..d184f2aea78d 100644
--- a/trunk/drivers/ssb/main.c
+++ b/trunk/drivers/ssb/main.c
@@ -1168,15 +1168,21 @@ EXPORT_SYMBOL(ssb_dma_translation);
 int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask)
 {
 	struct device *dma_dev = ssb_dev->dma_dev;
+	int err = 0;
 
 #ifdef CONFIG_SSB_PCIHOST
-	if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI)
-		return dma_set_mask(dma_dev, mask);
+	if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) {
+		err = pci_set_dma_mask(ssb_dev->bus->host_pci, mask);
+		if (err)
+			return err;
+		err = pci_set_consistent_dma_mask(ssb_dev->bus->host_pci, mask);
+		return err;
+	}
 #endif
 	dma_dev->coherent_dma_mask = mask;
 	dma_dev->dma_mask = &dma_dev->coherent_dma_mask;
 
-	return 0;
+	return err;
 }
 EXPORT_SYMBOL(ssb_dma_set_mask);