kernel: add missing null pointer check for mips dma ops inline patch on 3.18
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 3 Dec 2014 18:17:17 +0000 (18:17 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 3 Dec 2014 18:17:17 +0000 (18:17 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43511 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch

index 7425ba0..49d4457 100644 (file)
@@ -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);