aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-03 18:17:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-03 18:17:17 +0000
commit426467bebac905ee32343aa8aad88abc444d3755 (patch)
tree62bcd1d833816766d2e3d3ec4ac7b5131d2c8d9d /target/linux/generic
parent6ad5109211d084a643eef6a9cc02624d7b8faf6a (diff)
downloadupstream-426467bebac905ee32343aa8aad88abc444d3755.tar.gz
upstream-426467bebac905ee32343aa8aad88abc444d3755.tar.bz2
upstream-426467bebac905ee32343aa8aad88abc444d3755.zip
kernel: add missing null pointer check for mips dma ops inline patch on 3.18
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43511
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
index 7425ba0305..49d44574b9 100644
--- a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
@@ -423,6 +423,15 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
static inline int
+@@ -54,7 +391,7 @@ dma_set_mask(struct device *dev, u64 mas
+ if(!dev->dma_mask || !dma_supported(dev, mask))
+ return -EIO;
+
+- if (ops->set_dma_mask)
++ if (ops && ops->set_dma_mask)
+ return ops->set_dma_mask(dev, mask);
+
+ *dev->dma_mask = mask;
@@ -74,7 +411,11 @@ static inline void *dma_alloc_attrs(stru
void *ret;
struct dma_map_ops *ops = get_dma_ops(dev);