| Message ID | E1dxssn-0006iu-Um@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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; }
Use devm_clk_get() to get the clock for the LCD. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/video/fbdev/sa1100fb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)