[PATCH 5/8] video: fbdev: au1200fb: Fix error handling path
walter harms
wharms at bfs.de
Tue Oct 17 10:35:19 UTC 2017
Am 16.10.2017 21:04, schrieb Christophe JAILLET:
> Rewrite the exit path based on 'au1200fb_drv_remove()'.
> We can safely iterate for all already handled planes. Even if not
> completely initialized, the functions that are called will silently accept
> the 'fb_info' structure that is passed.
>
> As soon as we find a NULL in the '_au1200fb_infos' array, we know that we
> have released all what we needed to release. So we can 'break'.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
> ---
> drivers/video/fbdev/au1200fb.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
> index 0d8ed0ef9183..e531543bc707 100644
> --- a/drivers/video/fbdev/au1200fb.c
> +++ b/drivers/video/fbdev/au1200fb.c
> @@ -1760,11 +1760,19 @@ static int au1200fb_drv_probe(struct platform_device *dev)
> return 0;
>
> failed:
> - /* NOTE: This only does the current plane/window that failed; others are still active */
> - if (fbi) {
> + for (plane = 0; plane < device_count; ++plane) {
> + fbi = _au1200fb_infos[plane];
> + if (!fbi)
> + break;
> +
> + /* Clean up all probe data */
> + unregister_framebuffer(fbi);
> if (fbi->cmap.len != 0)
> fb_dealloc_cmap(&fbi->cmap);
While you are here ... fb_dealloc_cmap() is a collection of free's()
the check for fbi->cmap.len can be omitted (or moved to fb_dealloc_cmap).
re,
wh
> kfree(fbi->pseudo_palette);
> +
> + framebuffer_release(fbi);
> + _au1200fb_infos[plane] = NULL;
> }
> return ret;
> }
More information about the dri-devel
mailing list