aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-03-14 05:12:45 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-09 05:55:48 -0400
commitc58f66165d74cf48cd63f3ede137e1d2b7843f88 (patch)
tree604e5a70ac4377d813ad22c99f839185a8610541 /drivers/video
parente3e11f516398c4274bedea54102505e64f3be558 (diff)
video: mx3fb: Use devm_kzalloc
Replace kzalloc by devm_kzalloc and remove the kfree() calls. Signed-off-by: Denis Carikli <denis@eukrea.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/mx3fb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index 142e860fb527..ee95de80a487 100644
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -1496,7 +1496,7 @@ static int mx3fb_probe(struct platform_device *pdev)
1496 if (!sdc_reg) 1496 if (!sdc_reg)
1497 return -EINVAL; 1497 return -EINVAL;
1498 1498
1499 mx3fb = kzalloc(sizeof(*mx3fb), GFP_KERNEL); 1499 mx3fb = devm_kzalloc(&pdev->dev, sizeof(*mx3fb), GFP_KERNEL);
1500 if (!mx3fb) 1500 if (!mx3fb)
1501 return -ENOMEM; 1501 return -ENOMEM;
1502 1502
@@ -1542,7 +1542,6 @@ ersdc0:
1542 dmaengine_put(); 1542 dmaengine_put();
1543 iounmap(mx3fb->reg_base); 1543 iounmap(mx3fb->reg_base);
1544eremap: 1544eremap:
1545 kfree(mx3fb);
1546 dev_err(dev, "mx3fb: failed to register fb\n"); 1545 dev_err(dev, "mx3fb: failed to register fb\n");
1547 return ret; 1546 return ret;
1548} 1547}
@@ -1561,7 +1560,6 @@ static int mx3fb_remove(struct platform_device *dev)
1561 dmaengine_put(); 1560 dmaengine_put();
1562 1561
1563 iounmap(mx3fb->reg_base); 1562 iounmap(mx3fb->reg_base);
1564 kfree(mx3fb);
1565 return 0; 1563 return 0;
1566} 1564}
1567 1565