| From 2195d945e62b8c255bf8fc852513a82009b298bc Mon Sep 17 00:00:00 2001 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Sat, 31 Aug 2019 12:00:24 +0200 |
| Subject: [PATCH] pxa168fb: Fix the function used to release some memory in an |
| error handling path |
| |
| commit 3c911fe799d1c338d94b78e7182ad452c37af897 upstream. |
| |
| In the probe function, some resources are allocated using 'dma_alloc_wc()', |
| they should be released with 'dma_free_wc()', not 'dma_free_coherent()'. |
| |
| We already use 'dma_free_wc()' in the remove function, but not in the |
| error handling path of the probe function. |
| |
| Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already |
| PAGE_ALIGNed. |
| |
| Fixes: 638772c7553f ("fb: add support of LCD display controller on pxa168/910 (base layer)") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Reviewed-by: Lubomir Rintel <lkundrak@v3.sk> |
| CC: YueHaibing <yuehaibing@huawei.com> |
| Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190831100024.3248-1-christophe.jaillet@wanadoo.fr |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c |
| index 1410f476e135..1fc50fc0694b 100644 |
| --- a/drivers/video/fbdev/pxa168fb.c |
| +++ b/drivers/video/fbdev/pxa168fb.c |
| @@ -766,8 +766,8 @@ static int pxa168fb_probe(struct platform_device *pdev) |
| failed_free_clk: |
| clk_disable_unprepare(fbi->clk); |
| failed_free_fbmem: |
| - dma_free_coherent(fbi->dev, info->fix.smem_len, |
| - info->screen_base, fbi->fb_start_dma); |
| + dma_free_wc(fbi->dev, info->fix.smem_len, |
| + info->screen_base, fbi->fb_start_dma); |
| failed_free_info: |
| kfree(info); |
| |
| @@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev) |
| |
| irq = platform_get_irq(pdev, 0); |
| |
| - dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len), |
| + dma_free_wc(fbi->dev, info->fix.smem_len, |
| info->screen_base, info->fix.smem_start); |
| |
| clk_disable_unprepare(fbi->clk); |
| -- |
| 2.7.4 |
| |
