From 4bc89aba632394ce22fbca86d9d01cd861185f89 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 31 Jul 2012 15:54:20 +0200 Subject: [PATCH] --- yaml --- r: 333419 b: refs/heads/master c: e31f8745847c0086f909e04d4781804347c2377d h: refs/heads/master i: 333417: 76f140d5d283df5db31fe3caa01f41a18bfc3660 333415: 88d9340ebe41fde98e148d1ca4251dbb1f9fd327 v: v3 --- [refs] | 2 +- trunk/drivers/video/bf537-lq035.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b9ba4d26aad5..c52e81845fdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1bea50288c7a22e68c01bb11cdb2a8db7d2fa39 +refs/heads/master: e31f8745847c0086f909e04d4781804347c2377d diff --git a/trunk/drivers/video/bf537-lq035.c b/trunk/drivers/video/bf537-lq035.c index befbc80d11fc..7347aa1e5e4a 100644 --- a/trunk/drivers/video/bf537-lq035.c +++ b/trunk/drivers/video/bf537-lq035.c @@ -760,18 +760,20 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev) bfin_lq035_fb.flags = FBINFO_DEFAULT; - bfin_lq035_fb.pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL); + bfin_lq035_fb.pseudo_palette = devm_kzalloc(&pdev->dev, + sizeof(u32) * 16, + GFP_KERNEL); if (bfin_lq035_fb.pseudo_palette == NULL) { pr_err("failed to allocate pseudo_palette\n"); ret = -ENOMEM; - goto out_palette; + goto out_table; } if (fb_alloc_cmap(&bfin_lq035_fb.cmap, NBR_PALETTE, 0) < 0) { pr_err("failed to allocate colormap (%d entries)\n", NBR_PALETTE); ret = -EFAULT; - goto out_cmap; + goto out_table; } if (register_framebuffer(&bfin_lq035_fb) < 0) { @@ -804,9 +806,6 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev) unregister_framebuffer(&bfin_lq035_fb); out_reg: fb_dealloc_cmap(&bfin_lq035_fb.cmap); -out_cmap: - kfree(bfin_lq035_fb.pseudo_palette); -out_palette: out_table: dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0); fb_buffer = NULL; @@ -834,7 +833,6 @@ static int __devexit bfin_lq035_remove(struct platform_device *pdev) free_dma(CH_PPI); - kfree(bfin_lq035_fb.pseudo_palette); fb_dealloc_cmap(&bfin_lq035_fb.cmap);