| From d7286c96fb4456cd9ac12943d58819c9f7a349dc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 29 Apr 2020 10:45:05 +0200 |
| Subject: video: pxafb: Fix the function used to balance a |
| 'dma_alloc_coherent()' call |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ 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 | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c |
| index 00b96a78676ef..6f972bed410a9 100644 |
| --- a/drivers/video/fbdev/pxafb.c |
| +++ b/drivers/video/fbdev/pxafb.c |
| @@ -2417,8 +2417,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); |
| |
| return 0; |
| } |
| -- |
| 2.25.1 |
| |