diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-08-07 08:05:10 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-10 21:04:42 +1000 |
| commit | 8f2ea1fd3f97ab7a809e939b5b9005a16f862439 (patch) | |
| tree | 032d1fff16d11eac353a1174febd70bbdbf2c991 /include/asm-powerpc/dma-mapping.h | |
| parent | 939e60f6808a9ffd3a4e5f145057379c138c89aa (diff) | |
| download | blackbird-op-linux-8f2ea1fd3f97ab7a809e939b5b9005a16f862439.tar.gz blackbird-op-linux-8f2ea1fd3f97ab7a809e939b5b9005a16f862439.zip | |
[POWERPC] Fix initialization and usage of dma_mask
powerpc has a couple of bugs in the usage of dma_masks that tend to
break when drivers explicitly try to set a 32-bit mask for example.
First, the code that generates the pci devices from the OF device-tree
doesn't initialize the mask properly, then our implementation of
set_dma_mask() was trying to validate the -previous- mask value, not the
one passed in as an argument.
This fixes these problems.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/dma-mapping.h')
| -rw-r--r-- | include/asm-powerpc/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h index f6bd804d9090..744d6bb24116 100644 --- a/include/asm-powerpc/dma-mapping.h +++ b/include/asm-powerpc/dma-mapping.h @@ -95,7 +95,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask) return -EIO; if (dma_ops->set_dma_mask != NULL) return dma_ops->set_dma_mask(dev, dma_mask); - if (!dev->dma_mask || !dma_supported(dev, *dev->dma_mask)) + if (!dev->dma_mask || !dma_supported(dev, dma_mask)) return -EIO; *dev->dma_mask = dma_mask; return 0; |
