mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
OMAP: DSS2: OMAPFB: Fix probe error path
Move sysfs entry creation to omapfb_probe() from omapfb_create_framebuffers(). This will make sure that sysfs entry is not left behind in case of unsuccessful probe due to failure in enabling fb0 of omapfb_create_framebuffers(). Signed-off-by: Afzal Mohammed <lazfamam@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
parent
f3fe53c120
commit
e26ed44c95
1 changed files with 7 additions and 7 deletions
|
@ -2005,13 +2005,6 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DBG("create sysfs for fbs\n");
|
|
||||||
r = omapfb_create_sysfs(fbdev);
|
|
||||||
if (r) {
|
|
||||||
dev_err(fbdev->dev, "failed to create sysfs entries\n");
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Enable fb0 */
|
/* Enable fb0 */
|
||||||
if (fbdev->num_fbs > 0) {
|
if (fbdev->num_fbs > 0) {
|
||||||
struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);
|
struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);
|
||||||
|
@ -2297,6 +2290,13 @@ static int omapfb_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DBG("create sysfs for fbs\n");
|
||||||
|
r = omapfb_create_sysfs(fbdev);
|
||||||
|
if (r) {
|
||||||
|
dev_err(fbdev->dev, "failed to create sysfs entries\n");
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
|
Loading…
Reference in a new issue