diff options
| author | Luc Verhaegen <[email protected]> | 2014-11-14 13:26:49 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <[email protected]> | 2014-11-14 15:28:39 +0200 |
| commit | bf2fda157a9ab50f65da60a365ede3a5b529d025 (patch) | |
| tree | 8e8f1df828d61876101d4aeb7605c72ffc38bfef | |
| parent | 1270be4a4fb852630280638cbb169b67c485b3e3 (diff) | |
simplefb: add goto error path to probe
Use the usual kernel style of goto error_foo to free resources on probe
error. This is a preparation patch for adding clocks support.
While at it also update ioremap_wc error return from ENODEV to ENOMEM.
Signed-off-by: Luc Verhaegen <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Maxime Ripard <[email protected]>
Reviewed-by: David Herrmann <[email protected]>
Acked-by: Grant Likely <[email protected]>
Signed-off-by: Tomi Valkeinen <[email protected]>
| -rw-r--r-- | drivers/video/fbdev/simplefb.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c index ec112c13eb05..cdcf1fe46eae 100644 --- a/drivers/video/fbdev/simplefb.c +++ b/drivers/video/fbdev/simplefb.c @@ -220,8 +220,8 @@ static int simplefb_probe(struct platform_device *pdev) info->apertures = alloc_apertures(1); if (!info->apertures) { - framebuffer_release(info); - return -ENOMEM; + ret = -ENOMEM; + goto error_fb_release; } info->apertures->ranges[0].base = info->fix.smem_start; info->apertures->ranges[0].size = info->fix.smem_len; @@ -231,8 +231,8 @@ static int simplefb_probe(struct platform_device *pdev) info->screen_base = ioremap_wc(info->fix.smem_start, info->fix.smem_len); if (!info->screen_base) { - framebuffer_release(info); - return -ENODEV; + ret = -ENOMEM; + goto error_fb_release; } info->pseudo_palette = par->palette; @@ -247,14 +247,18 @@ static int simplefb_probe(struct platform_device *pdev) ret = register_framebuffer(info); if (ret < 0) { dev_err(&pdev->dev, "Unable to register simplefb: %d\n", ret); - iounmap(info->screen_base); - framebuffer_release(info); - return ret; + goto error_unmap; } dev_info(&pdev->dev, "fb%d: simplefb registered!\n", info->node); return 0; + +error_unmap: + iounmap(info->screen_base); +error_fb_release: + framebuffer_release(info); + return ret; } static int simplefb_remove(struct platform_device *pdev) |