video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Wed, 29 Apr 2020 08:45:05 +0000 (10:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 09:02:00 +0000 (11:02 +0200)
[ Upstream commit 499a2c41b954518c372873202d5e7714e22010c4 ]

'dma_alloc_coherent()' must be balanced by a call to 'dma_free_coherent()'
not 'dma_free_wc()'.
The correct dma_free_ function is already used in the error handling path
of the probe function.

Fixes: 77e196752bdd ("[ARM] pxafb: allow video memory size to be configurable")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Jani Nikula <jani.nikula@intel.com>
cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200429084505.108897-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/video/fbdev/pxafb.c

index 8503310a38167ce174e670bf5eb5af578095bd4a..7f8b6af29aab4e4e1be8ca1777eb80a5c85c5849 100644 (file)
@@ -2447,8 +2447,8 @@ static int pxafb_remove(struct platform_device *dev)
 
        free_pages_exact(fbi->video_mem, fbi->video_mem_size);
 
-       dma_free_wc(&dev->dev, fbi->dma_buff_size, fbi->dma_buff,
-                   fbi->dma_buff_phys);
+       dma_free_coherent(&dev->dev, fbi->dma_buff_size, fbi->dma_buff,
+                         fbi->dma_buff_phys);
 
        iounmap(fbi->mmio_base);