summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-10-17 16:01:12 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-10-17 16:01:12 +0200
commite43064ccd4b47fcb25c7f6806da1e7368312edfe (patch)
tree798c294d2ac90fb8ae376cf84932799fe6c7ed22
parentba1d36ba09becdc7f65e0140f13b31762ac31941 (diff)
video: sa1100fb: use devm_clk_get()
Use devm_clk_get() to get the clock for the LCD. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r--drivers/video/fbdev/sa1100fb.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c
index 05a80e08dcde..1562d7607dd2 100644
--- a/drivers/video/fbdev/sa1100fb.c
+++ b/drivers/video/fbdev/sa1100fb.c
@@ -1230,10 +1230,9 @@ static int sa1100fb_probe(struct platform_device *pdev)
if (!fbi)
goto failed;
- fbi->clk = clk_get(&pdev->dev, NULL);
+ fbi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(fbi->clk)) {
ret = PTR_ERR(fbi->clk);
- fbi->clk = NULL;
goto failed;
}
@@ -1289,8 +1288,6 @@ static int sa1100fb_probe(struct platform_device *pdev)
failed:
if (fbi)
iounmap(fbi->base);
- if (fbi->clk)
- clk_put(fbi->clk);
release_mem_region(res->start, resource_size(res));
return ret;
}