From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: b.zolnierkie@samsung.com, tj@kernel.org Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr> Subject: [PATCH 5/8] video: fbdev: au1200fb: Fix error handling path Date: Mon, 16 Oct 2017 21:04:51 +0200 [thread overview] Message-ID: <1c406b36210dc5e6e4443d52a3cbc2307f7b706e.1508179264.git.christophe.jaillet@wanadoo.fr> (raw) In-Reply-To: <cover.1508179264.git.christophe.jaillet@wanadoo.fr> In-Reply-To: <cover.1508179264.git.christophe.jaillet@wanadoo.fr> 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@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); kfree(fbi->pseudo_palette); + + framebuffer_release(fbi); + _au1200fb_infos[plane] = NULL; } return ret; } -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> To: b.zolnierkie@samsung.com, tj@kernel.org Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr> Subject: [PATCH 5/8] video: fbdev: au1200fb: Fix error handling path Date: Mon, 16 Oct 2017 19:04:51 +0000 [thread overview] Message-ID: <1c406b36210dc5e6e4443d52a3cbc2307f7b706e.1508179264.git.christophe.jaillet@wanadoo.fr> (raw) In-Reply-To: <cover.1508179264.git.christophe.jaillet@wanadoo.fr> 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@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); kfree(fbi->pseudo_palette); + + framebuffer_release(fbi); + _au1200fb_infos[plane] = NULL; } return ret; } -- 2.11.0
next prev parent reply other threads:[~2017-10-16 19:06 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20171016190602epcas2p1c54546e982659187188f178846c54531@epcas2p1.samsung.com> 2017-10-16 19:04 ` [PATCH 0/8] video: fbdev: au1200fb: Fix error handling path of 'au1200fb_drv_probe()' Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` [PATCH 1/8] video: fbdev: au1200fb: Fix a potential double free Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` [PATCH 2/8] video: fbdev: au1200fb: Return an error code if a memory allocation fails Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` [PATCH 3/8] video: fbdev: au1200fb: Release some resources " Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` [PATCH 4/8] video: fbdev: au1200fb: Fix error handling path Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET [this message] 2017-10-16 19:04 ` [PATCH 5/8] " Christophe JAILLET 2017-10-17 10:35 ` walter harms 2017-10-17 10:35 ` walter harms 2017-10-16 19:04 ` [PATCH 6/8] video: fbdev: au1200fb: Remove some dead code Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-17 11:33 ` Dan Carpenter 2017-10-17 11:33 ` Dan Carpenter 2017-10-16 19:04 ` [PATCH 7/8] video: fbdev: au1200fb: Propagate an error code Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-10-16 19:04 ` [PATCH 8/8] video: fbdev: au1200fb: Style clean up Christophe JAILLET 2017-10-16 19:04 ` Christophe JAILLET 2017-11-09 13:12 ` [PATCH 0/8] video: fbdev: au1200fb: Fix error handling path of 'au1200fb_drv_probe()' Bartlomiej Zolnierkiewicz 2017-11-09 13:12 ` Bartlomiej Zolnierkiewicz 2017-11-09 13:12 ` Bartlomiej Zolnierkiewicz 2017-11-09 19:32 ` Christophe JAILLET
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1c406b36210dc5e6e4443d52a3cbc2307f7b706e.1508179264.git.christophe.jaillet@wanadoo.fr \ --to=christophe.jaillet@wanadoo.fr \ --cc=b.zolnierkie@samsung.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.