init dma masks in pnp_dev

PNP now initializes device dma masks, which prevents oopses when generic
dma calls are made using pnp device nodes.

This assumes PNP only uses ISA DMA, with 24 bit addresses; and that it's
safe to init those masks for all devices (rather than finding out which
devices have been assigned DMA channels, and handling only those).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Adam Belay <abelay@novell.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index aec83ec5ea23..d8d75541552c 100644
--- a/drivers/pnp/core.c
+++ b/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);