summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorYangtao Li <frank.li@vivo.com>2023-07-10 16:19:59 +0300
committerHelge Deller <deller@gmx.de>2023-07-11 08:26:13 +0300
commit55dd7378ba94afe389e7edec23510bad80d344ca (patch)
tree55596a32af3cd944ade03016f280297be22c238a /drivers/video
parent45fcc058a75bf5d65cf4c32da44a252fbe873cd4 (diff)
downloadlinux-55dd7378ba94afe389e7edec23510bad80d344ca.tar.xz
fbdev: imxfb: Convert to devm_kmalloc_array()
No need for manual kfree in the error path and the remove function. Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/imxfb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 385c4715c7b7..7020b5f6434d 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -673,7 +673,8 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
pr_debug("%s\n",__func__);
- info->pseudo_palette = kmalloc_array(16, sizeof(u32), GFP_KERNEL);
+ info->pseudo_palette = devm_kmalloc_array(&pdev->dev, 16,
+ sizeof(u32), GFP_KERNEL);
if (!info->pseudo_palette)
return -ENOMEM;
@@ -1044,7 +1045,6 @@ failed_map:
failed_ioremap:
failed_getclock:
failed_of_parse:
- kfree(info->pseudo_palette);
failed_init:
framebuffer_release(info);
return ret;
@@ -1061,7 +1061,6 @@ static void imxfb_remove(struct platform_device *pdev)
fb_dealloc_cmap(&info->cmap);
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
fbi->map_dma);
- kfree(info->pseudo_palette);
framebuffer_release(info);
}