M Maurus Cuelenaere #
Message details and related content
Use the jzfb_enable() function instead of manually faking it in jzfb_probe().
Also add the reverse operation when the framebuffer couldn't be registered.
Signed-off-by: Maurus Cuelenaere <redacted>
---
drivers/video/jz4740_fb.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index cea7b7e..2f3ea57 100644
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c@@ -707,16 +707,13 @@ static int __devinit jzfb_probe(struct platform_device *pdev) fb_alloc_cmap(&fb->cmap, 256, 0); - clk_enable(jzfb->ldclk); - jzfb->is_enabled = 1; - - writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0); - fb->mode = NULL; jzfb_set_par(fb); jzfb_pins_operation(jzfb, REQUEST_PINS); + jzfb_blank(FB_BLANK_UNBLANK, fb); + ret = register_framebuffer(fb); if (ret) { dev_err(&pdev->dev, "Failed to register framebuffer: %d\n", ret);
@@ -726,6 +723,7 @@ static int __devinit jzfb_probe(struct platform_device *pdev) return 0; err_free_devmem: + jzfb_blank(FB_BLANK_POWERDOWN, fb); jzfb_pins_operation(jzfb, FREE_PINS); fb_dealloc_cmap(&fb->cmap);
--
1.7.4