---

yaml --- r: 54571 b: refs/heads/master c: 2e17c55 h: refs/heads/master i: 54569: f97196c 54567: e4778cf v: v3
git-mirror · May 8, 2007 · 590b503 · 590b503
1 parent bab157b
commit 590b503
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8bc500a10ab9cb3861e5bb71155d7bd2bbd2d5
+refs/heads/master: 2e17c5508fa015f2c7690e29041f437e9308c64f
diff --git a/trunk/drivers/pnp/core.c b/trunk/drivers/pnp/core.c
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/dma-mapping.h>
 
 #include "base.h"
 
@@ -114,6 +115,8 @@ int __pnp_add_device(struct pnp_dev *dev)
 	int ret;
 	pnp_fixup_device(dev);
 	dev->dev.bus = &pnp_bus_type;
+	dev->dev.dma_mask = &dev->dma_mask;
+	dev->dma_mask = dev->dev.coherent_dma_mask = DMA_24BIT_MASK;
 	dev->dev.release = &pnp_release_device;
 	dev->status = PNP_READY;
 	spin_lock(&pnp_lock);

diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
@@ -177,6 +177,7 @@ static inline void pnp_set_card_drvdata (struct pnp_card_link *pcard, void *data
 
 struct pnp_dev {
 	struct device dev;		/* Driver Model device interface */
+	u64 dma_mask;
 	unsigned char number;		/* used as an index, must be unique */
 	int status;