fbdev: sh7760fb: Fix a possible memory leak in sh7760fb_alloc_mem()

[ Upstream commit f89d17ae2ac42931be2a0153fecbf8533280c927 ]

When information such as info->screen_base is not ready, calling
sh7760fb_free_mem() does not release memory correctly. Call
dma_free_coherent() instead.

Fixes: 4a25e41831ee ("video: sh7760fb: SH7760/SH7763 LCDC framebuffer driver")
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c
index c8ba3aeb327789b8a135e2697678236ecfc16461..d4ef70b178859bb5cf00f3cf8a18eea23f43efbe 100644 (file)
--- a/drivers/video/fbdev/sh7760fb.c
+++ b/drivers/video/fbdev/sh7760fb.c
@@ -412,12 +412,11 @@ static int sh7760fb_alloc_mem(struct fb_info *info)
                vram = PAGE_SIZE;
 
        fbmem = dma_alloc_coherent(info->device, vram, &par->fbdma, GFP_KERNEL);
-
        if (!fbmem)
                return -ENOMEM;
 
        if ((par->fbdma & SH7760FB_DMA_MASK) != SH7760FB_DMA_MASK) {
-               sh7760fb_free_mem(info);
+               dma_free_coherent(info->device, vram, fbmem, par->fbdma);
                dev_err(info->device, "kernel gave me memory at 0x%08lx, which is"
                        "unusable for the LCDC\n", (unsigned long)par->fbdma);
                return -ENOMEM;