Merge tag 'v4.4.207' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / include / linux / dma-mapping.h

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 3f6e858..1d4cb72 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -189,8 +189,7 @@ static inline unsigned int dma_get_max_seg_size(struct device *dev)
        return SZ_64K;
 }
 
-static inline unsigned int dma_set_max_seg_size(struct device *dev,
-                                               unsigned int size)
+static inline int dma_set_max_seg_size(struct device *dev, unsigned int size)
 {
        if (dev->dma_parms) {
                dev->dma_parms->max_segment_size = size;