Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sh: fix a number of Oopses and leaks in SH framebuffer driver 

Fix a number of Oopses, memory leaks and unbalanced calls on error paths in
sh_mobile_lcdcfb.c.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Guennadi Liakhovetski 2010-04-30 16:07:00 +00:00 committed by Paul Mundt
parent 83515bc7df
commit 8bed90557d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/video/sh_mobile_lcdcfb.c
View File

@ -695,6 +695,7 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,
* 1) Enable Runtime PM * 1) Enable Runtime PM
* 2) Force Runtime PM Resume since hardware is accessed from probe() * 2) Force Runtime PM Resume since hardware is accessed from probe()
*/ */
priv->dev = &pdev->dev;
pm_runtime_enable(priv->dev); pm_runtime_enable(priv->dev);
pm_runtime_resume(priv->dev); pm_runtime_resume(priv->dev);
return 0; return 0;
@ -957,25 +958,24 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
if (!pdev->dev.platform_data) { if (!pdev->dev.platform_data) {
dev_err(&pdev->dev, "no platform data defined\n"); dev_err(&pdev->dev, "no platform data defined\n");
error = -EINVAL; return -EINVAL;
goto err0;
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i = platform_get_irq(pdev, 0); i = platform_get_irq(pdev, 0);
if (!res || i < 0) { if (!res || i < 0) {
dev_err(&pdev->dev, "cannot get platform resources\n"); dev_err(&pdev->dev, "cannot get platform resources\n");
error = -ENOENT; return -ENOENT;
goto err0;
} }
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) { if (!priv) {
dev_err(&pdev->dev, "cannot allocate device data\n"); dev_err(&pdev->dev, "cannot allocate device data\n");
error = -ENOMEM; return -ENOMEM;
goto err0;
} }
platform_set_drvdata(pdev, priv);
error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED, error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED,
dev_name(&pdev->dev), priv); dev_name(&pdev->dev), priv);
if (error) { if (error) {
@ -984,8 +984,6 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
} }
priv->irq = i; priv->irq = i;
priv->dev = &pdev->dev;
platform_set_drvdata(pdev, priv);
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
j = 0; j = 0;
@ -1099,9 +1097,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
info = ch->info; info = ch->info;
if (info->fbdefio) { if (info->fbdefio) {
priv->ch->sglist = vmalloc(sizeof(struct scatterlist) * ch->sglist = vmalloc(sizeof(struct scatterlist) *
info->fix.smem_len >> PAGE_SHIFT); info->fix.smem_len >> PAGE_SHIFT);
if (!priv->ch->sglist) { if (!ch->sglist) {
dev_err(&pdev->dev, "cannot allocate sglist\n"); dev_err(&pdev->dev, "cannot allocate sglist\n");
goto err1; goto err1;
} }
@ -1126,9 +1124,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
} }
return 0; return 0;
err1: err1:
sh_mobile_lcdc_remove(pdev); sh_mobile_lcdc_remove(pdev);
err0:
return error; return error;
} }
@ -1139,7 +1137,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
int i; int i;
for (i = 0; i < ARRAY_SIZE(priv->ch); i++) for (i = 0; i < ARRAY_SIZE(priv->ch); i++)
if (priv->ch[i].info->dev) if (priv->ch[i].info && priv->ch[i].info->dev)
unregister_framebuffer(priv->ch[i].info); unregister_framebuffer(priv->ch[i].info);
sh_mobile_lcdc_stop(priv); sh_mobile_lcdc_stop(priv);
@ -1162,7 +1160,8 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
if (priv->dot_clk) if (priv->dot_clk)
clk_put(priv->dot_clk); clk_put(priv->dot_clk);
pm_runtime_disable(priv->dev); if (priv->dev)
pm_runtime_disable(priv->dev);
if (priv->base) if (priv->base)
iounmap(priv->base); iounmap(priv->base);