Commit 2e17c550 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Adam Belay <abelay@novell.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f8bc500

drivers/pnp/core.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/pnp.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE