2010-06-30 14:19:00

by Afzal Mohammed

[permalink] [raw]
Subject: [PATCH] OMAP:DSS2:OMAPFB: Fix probe error path

If enabling fb0 fails in omapfb_create_framebuffers(), remove
sysfs file before returning to probe. This is required to complete
the cleanup in the above mentioned error case.

Signed-off-by: Afzal Mohammed <[email protected]>
---
drivers/video/omap2/omapfb/omapfb-main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 4b4506d..2319b81 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -1945,6 +1945,7 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
r = omapfb_overlay_enable(ovl, 1);

if (r) {
+ omapfb_remove_sysfs(fbdev);
dev_err(fbdev->dev,
"failed to enable overlay\n");
return r;
--
1.7.0.4


2010-07-01 09:55:11

by Tomi Valkeinen

[permalink] [raw]
Subject: Re: [PATCH] OMAP:DSS2:OMAPFB: Fix probe error path

Hi,

On Wed, 2010-06-30 at 16:15 +0200, ext Afzal Mohammed wrote:
> If enabling fb0 fails in omapfb_create_framebuffers(), remove
> sysfs file before returning to probe. This is required to complete
> the cleanup in the above mentioned error case.

omapfb frees the resources in omapfb_free_resources(). I believe
removing sysfs should also be put into omapfb_free_resources() to be
consistent, and not as an explicit call like in this patch.

However, I'm not sure if some sysfs-allocated flag is needed for this to
work in all cases.

Tomi