Author: nbd Date: 2014-12-03 19:17:17 +0100 (Wed, 03 Dec 2014) New Revision: 43511
Modified: trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch Log: kernel: add missing null pointer check for mips dma ops inline patch on 3.18 Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch 2014-12-03 16:05:23 UTC (rev 43510) +++ trunk/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch 2014-12-03 18:17:17 UTC (rev 43511) @@ -423,6 +423,15 @@ } 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); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
