|
@@ -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");
|
|
@@ -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)) {
|
|
@@ -671,8 +672,6 @@ out7:
|
|
|
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);
|
|
@@ -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
|