summaryrefslogtreecommitdiffstats
path: root/include/linux/pnp.h
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-05-08 00:25:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:15:00 -0700
commit2e17c5508fa015f2c7690e29041f437e9308c64f (patch)
treed53402b77180827931fc31b190be53c6b20ec2c0 /include/linux/pnp.h
parent6f8bc500a10ab9cb3861e5bb71155d7bd2bbd2d5 (diff)
downloadlinux-stable-2e17c5508fa015f2c7690e29041f437e9308c64f.tar.gz
linux-stable-2e17c5508fa015f2c7690e29041f437e9308c64f.tar.bz2
linux-stable-2e17c5508fa015f2c7690e29041f437e9308c64f.zip
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>
Diffstat (limited to 'include/linux/pnp.h')
-rw-r--r--include/linux/pnp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 9a5226f0f169..00dae5ba128a 100644
--- a/include/linux/pnp.h
+++ b/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;