Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333428
b: refs/heads/master
c: b7e69ad
h: refs/heads/master
v: v3
  • Loading branch information
Damien Cassou authored and Florian Tobias Schandinat committed Aug 23, 2012
1 parent fffca9e commit d7f2714
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b2ca7f4d740dc65322386b78cd5bdbceaa524fe0
refs/heads/master: b7e69add39481dafb509a07ab527784d415b567b
8 changes: 3 additions & 5 deletions trunk/drivers/video/bf54x-lq043fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)

fbinfo->fbops = &bfin_bf54x_fb_ops;

fbinfo->pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL);
fbinfo->pseudo_palette = devm_kzalloc(&pdev->dev, sizeof(u32) * 16,
GFP_KERNEL);
if (!fbinfo->pseudo_palette) {
printk(KERN_ERR DRIVER_NAME
"Fail to allocate pseudo_palette\n");
Expand All @@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
"Fail to allocate colormap (%d entries)\n",
BFIN_LCD_NBR_PALETTE_ENTRIES);
ret = -EFAULT;
goto out5;
goto out4;
}

if (request_ports(info)) {
Expand Down Expand Up @@ -671,8 +672,6 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
free_ports(info);
out6:
fb_dealloc_cmap(&fbinfo->cmap);
out5:
kfree(fbinfo->pseudo_palette);
out4:
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle);
Expand All @@ -699,7 +698,6 @@ static int __devexit bfin_bf54x_remove(struct platform_device *pdev)
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle);

kfree(fbinfo->pseudo_palette);
fb_dealloc_cmap(&fbinfo->cmap);

#ifndef NO_BL_SUPPORT
Expand Down

0 comments on commit d7f2714

Please sign in to comment.