summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-10-17 17:01:12 +0300
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-10-17 17:01:12 +0300
commitba1d36ba09becdc7f65e0140f13b31762ac31941 (patch)
treeaec22618aea116e223909775159ab2c959b304d5 /drivers/video
parent5eabff1cb9dad4e81ee387ac79f7521d078bfa8f (diff)
downloadlinux-ba1d36ba09becdc7f65e0140f13b31762ac31941.tar.xz
video: sa1100fb: use devm_kzalloc()
Use devm_kzalloc() when allocating the private data for the framebuffer device. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/sa1100fb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c
index fc2aaa5aca23..05a80e08dcde 100644
--- a/drivers/video/fbdev/sa1100fb.c
+++ b/drivers/video/fbdev/sa1100fb.c
@@ -1132,12 +1132,11 @@ static struct sa1100fb_info *sa1100fb_init_fbinfo(struct device *dev)
struct sa1100fb_info *fbi;
unsigned i;
- fbi = kmalloc(sizeof(struct sa1100fb_info) + sizeof(u32) * 16,
- GFP_KERNEL);
+ fbi = devm_kzalloc(dev, sizeof(struct sa1100fb_info) + sizeof(u32) * 16,
+ GFP_KERNEL);
if (!fbi)
return NULL;
- memset(fbi, 0, sizeof(struct sa1100fb_info));
fbi->dev = dev;
strcpy(fbi->fb.fix.id, SA1100_NAME);
@@ -1292,7 +1291,6 @@ static int sa1100fb_probe(struct platform_device *pdev)
iounmap(fbi->base);
if (fbi->clk)
clk_put(fbi->clk);
- kfree(fbi);
release_mem_region(res->start, resource_size(res));
return ret;
}