Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git

# Conflicts:
#	drivers/dma/tegra210-adma.c

diff --cc drivers/dma/tegra210-adma.c
index 5c6a5b35898732cc63d502a7153f0e2a0fe1eeb3,801740ad8e0d973e6ff3e1b737728c615b9969ba..4c396b8eaf0fccc6782c9e4e6728a5e00ad19e9c
--- 1/drivers/dma/tegra210-adma.c
--- 2/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@@ -914,21 -920,16 +919,21 @@@ static int tegra_adma_probe(struct plat
  
                res_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "global");
                if (res_base) {
 -                      if (WARN_ON(res_page->start <= res_base->start))
 -                              return -EINVAL;
 +                      resource_size_t page_offset, page_no;
 +                      unsigned int ch_base_offset;
  
 +                      if (res_page->start < res_base->start)
 +                              return -EINVAL;
                        page_offset = res_page->start - res_base->start;
 -                      page_no = div_u64(page_offset, cdata->ch_base_offset);
 +                      ch_base_offset = cdata->ch_base_offset;
 +                      if (!ch_base_offset)
 +                              return -EINVAL;
  
 -                      if (WARN_ON(page_no == 0 || page_no > cdata->max_page))
 +                      page_no = div_u64(page_offset, ch_base_offset);
-                       if (!page_no || page_no > INT_MAX)
++                      if (!page_no || page_no > cdata->max_page)
                                return -EINVAL;
  
 -                      tdma->ch_page_no = lower_32_bits(page_no) - 1;
 +                      tdma->ch_page_no = page_no - 1;
                        tdma->base_addr = devm_ioremap_resource(&pdev->dev, res_base);
                        if (IS_ERR(tdma->base_addr))
                                return PTR_ERR(tdma->base_addr);