Skip to content

Commit 55dd737

Browse files
bbkzzhdeller
authored andcommitted
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>
1 parent 45fcc05 commit 55dd737

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/video/fbdev/imxfb.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,8 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
673673

674674
pr_debug("%s\n",__func__);
675675

676-
info->pseudo_palette = kmalloc_array(16, sizeof(u32), GFP_KERNEL);
676+
info->pseudo_palette = devm_kmalloc_array(&pdev->dev, 16,
677+
sizeof(u32), GFP_KERNEL);
677678
if (!info->pseudo_palette)
678679
return -ENOMEM;
679680

@@ -1044,7 +1045,6 @@ static int imxfb_probe(struct platform_device *pdev)
10441045
failed_ioremap:
10451046
failed_getclock:
10461047
failed_of_parse:
1047-
kfree(info->pseudo_palette);
10481048
failed_init:
10491049
framebuffer_release(info);
10501050
return ret;
@@ -1061,7 +1061,6 @@ static void imxfb_remove(struct platform_device *pdev)
10611061
fb_dealloc_cmap(&info->cmap);
10621062
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
10631063
fbi->map_dma);
1064-
kfree(info->pseudo_palette);
10651064
framebuffer_release(info);
10661065
}
10671066

0 commit comments

Comments
 (0)