From 426467bebac905ee32343aa8aad88abc444d3755 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 3 Dec 2014 18:17:17 +0000 Subject: [PATCH] kernel: add missing null pointer check for mips dma ops inline patch on 3.18 Signed-off-by: Felix Fietkau SVN-Revision: 43511 --- .../generic/patches-3.18/132-mips_inline_dma_ops.patch | 9 +++++++++ 1 file changed, 9 insertions(+) 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 } 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);