target/linux/bcm27xx/patches-5.4/950-0761-staging-vchiq_arm-Use-g_dma_dev-for-dma_unmap_sg.patch

   1 From fecd0c670aabdbe5bac8fb58be374dd02ea2e8a2 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Thu, 4 Jun 2020 17:23:36 +0100
   4 Subject: [PATCH] staging: vchiq_arm: Use g_dma_dev for dma_unmap_sg
   5
   6 Commit "staging: vchiq_arm: Clean up 40-bit DMA support" failed to
   7 change one of the calls to dma_unmap_sg to pass in g_dma_dev (rather
   8 than g_dev). Correct that oversight.
   9
  10 See: https://github.com/raspberrypi/linux/issues/3647
  11
  12 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  13 ---
  14  .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c  | 2 +-
  15  1 file changed, 1 insertion(+), 1 deletion(-)
  16
  17 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
  18 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
  19 @@ -641,7 +641,7 @@ free_pagelist(struct vchiq_pagelist_info
  20          * NOTE: dma_unmap_sg must be called before the
  21          * cpu can touch any of the data/pages.
  22          */
  23 -       dma_unmap_sg(g_dev, pagelistinfo->scatterlist,
  24 +       dma_unmap_sg(g_dma_dev, pagelistinfo->scatterlist,
  25                      pagelistinfo->num_pages, pagelistinfo->dma_dir);
  26         pagelistinfo->scatterlist_mapped = 0;
  27